summaryrefslogtreecommitdiff
path: root/chromium/content/browser/gpu/gpu_internals_ui.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/gpu/gpu_internals_ui.cc')
-rw-r--r--chromium/content/browser/gpu/gpu_internals_ui.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/content/browser/gpu/gpu_internals_ui.cc b/chromium/content/browser/gpu/gpu_internals_ui.cc
index 210eb5fe2da..37e2a81ac26 100644
--- a/chromium/content/browser/gpu/gpu_internals_ui.cc
+++ b/chromium/content/browser/gpu/gpu_internals_ui.cc
@@ -227,9 +227,9 @@ std::unique_ptr<base::DictionaryValue> GpuInfoAsDictionaryValue() {
basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
gpu_info.gl_ws_extensions));
#if defined(USE_X11)
- basic_info->Append(NewDescriptionValuePair("Window manager",
- ui::GuessWindowManagerName()));
- {
+ if (gfx::GetXDisplay()) {
+ basic_info->Append(NewDescriptionValuePair("Window manager",
+ ui::GuessWindowManagerName()));
std::unique_ptr<base::Environment> env(base::Environment::Create());
std::string value;
const char kXDGCurrentDesktop[] = "XDG_CURRENT_DESKTOP";
@@ -266,10 +266,12 @@ std::unique_ptr<base::DictionaryValue> GpuInfoAsDictionaryValue() {
#endif
#if defined(USE_X11)
- basic_info->Append(NewDescriptionValuePair(
- "System visual ID", base::NumberToString(gpu_info.system_visual)));
- basic_info->Append(NewDescriptionValuePair(
- "RGBA visual ID", base::NumberToString(gpu_info.rgba_visual)));
+ if (gfx::GetXDisplay()) {
+ basic_info->Append(NewDescriptionValuePair(
+ "System visual ID", base::NumberToString(gpu_info.system_visual)));
+ basic_info->Append(NewDescriptionValuePair(
+ "RGBA visual ID", base::NumberToString(gpu_info.rgba_visual)));
+ }
#endif
info->Set("basic_info", std::move(basic_info));