Add WindowManager to about:gpu page on Linux/X11

content/browser/gpu/gpu_internals_ui.cc

Index: content/browser/gpu/gpu_internals_ui.cc
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index c338e02530e943fc01289897160d0a1a8776941a..1e9e32d32d9432421514c00b5d278818b7ea5c9b 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -34,6 +34,10 @@
 #include "ui/base/win/shell.h"
 #endif
 
+#if defined(OS_LINUX)

[piman, 2014/09/03 23:21:58]

&& defined(USE_X11)

[Zhenyao Mo, 2014/09/04 00:03:57]

Done.

+#include "ui/base/x/x11_util.h"
+#endif
+
 namespace content {
 namespace {
 
@@ -157,6 +161,10 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() {
                                              gpu_info.gl_ws_version));
   basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
                                              gpu_info.gl_ws_extensions));
+#if defined(OS_LINUX) && defined(USE_X11)
+  basic_info->Append(NewDescriptionValuePair("Window manager",
+                                             ui::GuessWindowManagerName()));
+#endif
   std::string direct_rendering = gpu_info.direct_rendering ? "Yes" : "No";
   basic_info->Append(
       NewDescriptionValuePair("Direct rendering", direct_rendering));