Add WindowManager to about:gpu page on Linux/X11

ui/base/x/x11_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 84 matching lines @@
                             max_length, // max length to get
                             False,      // deleted
                             AnyPropertyType,
                             type,
                             format,
                             num_items,
                             &remaining_bytes,
                             property);
 }
 
+bool GetWindowManagerName(std::string* wm_name) {
+  DCHECK(wm_name);
+  int wm_window = 0;
+  if (!GetIntProperty(GetX11RootWindow(),
+                      "_NET_SUPPORTING_WM_CHECK",
+                      &wm_window)) {
+    return false;
+  }
+
+  // It's possible that a window manager started earlier in this X session left
+  // a stale _NET_SUPPORTING_WM_CHECK property when it was replaced by a
+  // non-EWMH window manager, so we trap errors in the following requests to
+  // avoid crashes (issue 23860).
+
+  // EWMH requires the supporting-WM window to also have a
+  // _NET_SUPPORTING_WM_CHECK property pointing to itself (to avoid a stale
+  // property referencing an ID that's been recycled for another window), so we
+  // check that too.
+  gfx::X11ErrorTracker err_tracker;
+  int wm_window_property = 0;
+  bool result = GetIntProperty(
+      wm_window, "_NET_SUPPORTING_WM_CHECK", &wm_window_property);
+  if (err_tracker.FoundNewError() || !result ||
+      wm_window_property != wm_window) {
+    return false;
+  }
+
+  result = GetStringProperty(
+      static_cast<XID>(wm_window), "_NET_WM_NAME", wm_name);
+  return !err_tracker.FoundNewError() && result;
+}
+
 // A process wide singleton that manages the usage of X cursors.
 class XCursorCache {
  public:
   XCursorCache() {}
   ~XCursorCache() {
     Clear();
   }
 
   ::Cursor GetCursor(int cursor_shape) {
     // Lookup cursor by attempting to insert a null value, which avoids
@@ skipping 1033 matching lines @@
     image_skia.AddRepresentation(image_rep);
     canvas->DrawImageInt(image_skia, dest_offset.x(), dest_offset.y());
   } else {
     NOTIMPLEMENTED() << "Unsupported bits-per-pixel " << image->bits_per_pixel;
     return false;
   }
 
   return true;
 }
 
-bool GetWindowManagerName(std::string* wm_name) {
-  DCHECK(wm_name);
-  int wm_window = 0;
-  if (!GetIntProperty(GetX11RootWindow(),
-                      "_NET_SUPPORTING_WM_CHECK",
-                      &wm_window)) {
-    return false;
-  }
-
-  // It's possible that a window manager started earlier in this X session left
-  // a stale _NET_SUPPORTING_WM_CHECK property when it was replaced by a
-  // non-EWMH window manager, so we trap errors in the following requests to
-  // avoid crashes (issue 23860).
-
-  // EWMH requires the supporting-WM window to also have a
-  // _NET_SUPPORTING_WM_CHECK property pointing to itself (to avoid a stale
-  // property referencing an ID that's been recycled for another window), so we
-  // check that too.
-  gfx::X11ErrorTracker err_tracker;
-  int wm_window_property = 0;
-  bool result = GetIntProperty(
-      wm_window, "_NET_SUPPORTING_WM_CHECK", &wm_window_property);
-  if (err_tracker.FoundNewError() || !result ||
-      wm_window_property != wm_window) {
-    return false;
-  }
-
-  result = GetStringProperty(
-      static_cast<XID>(wm_window), "_NET_WM_NAME", wm_name);
-  return !err_tracker.FoundNewError() && result;
-}
-
 WindowManagerName GuessWindowManager() {
   std::string name;
   if (GetWindowManagerName(&name)) {
     // These names are taken from the WMs' source code.
     if (name == "Blackbox")
       return WM_BLACKBOX;
     if (name == "chromeos-wm")
       return WM_CHROME_OS;
     if (name == "Compiz" || name == "compiz")
       return WM_COMPIZ;
@@ skipping 12 matching lines @@
     if (name == "Mutter")
       return WM_MUTTER;
     if (name == "Openbox")
       return WM_OPENBOX;
     if (name == "Xfwm4")
       return WM_XFWM4;
   }
   return WM_UNKNOWN;
 }
 
+std::string GuessWindowManagerName() {
+  std::string name;
+  if (GetWindowManagerName(&name))
+    return name;
+  return "Unknown";
+}
+
 void SetDefaultX11ErrorHandlers() {
   SetX11ErrorHandlers(NULL, NULL);
 }
 
 bool IsX11WindowFullScreen(XID window) {
   // If _NET_WM_STATE_FULLSCREEN is in _NET_SUPPORTED, use the presence or
   // absence of _NET_WM_STATE_FULLSCREEN in _NET_WM_STATE to determine
   // whether we're fullscreen.
   XAtom fullscreen_atom = GetAtom("_NET_WM_STATE_FULLSCREEN");
   if (WmSupportsHint(fullscreen_atom)) {
@@ skipping 181 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui