Move a bunch of random other files to src/ui/base...

ui/base/x/x11_util.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "app/x11_util.h"
+#include "ui/base/x/x11_util.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
 #include <list>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
-#include "app/x11_util_internal.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
+#include "ui/base/x/x11_util_internal.h"
 
-namespace x11_util {
+namespace ui {
 
 namespace {
 
 // Used to cache the XRenderPictFormat for a visual/display pair.
 struct CachedPictFormat {
   bool equals(Display* display, Visual* visual) const {
     return display == this->display && visual == this->visual;
   }
 
   Display* display;
@@ skipping 293 matching lines @@
   XID* children = NULL;
   unsigned int num_children = 0;
   XQueryTree(GetXDisplay(), window, &root, &parent, &children, &num_children);
   if (children)
     XFree(children);
   return parent;
 }
 
 XID GetHighestAncestorWindow(XID window, XID root) {
   while (true) {
-    XID parent = x11_util::GetParentWindow(window);
+    XID parent = GetParentWindow(window);
     if (parent == None)
       return None;
     if (parent == root)
       return window;
     window = parent;
   }
 }
 
 bool GetWindowDesktop(XID window, int* desktop) {
   return GetIntProperty(window, "_NET_WM_DESKTOP", desktop);
@@ skipping 282 matching lines @@
   if (children)
     XFree(children);
 
   *parent_is_root = root_window == *parent_window;
   return true;
 }
 
 bool GetWindowManagerName(std::string* wm_name) {
   DCHECK(wm_name);
   int wm_window = 0;
-  if (!x11_util::GetIntProperty(x11_util::GetX11RootWindow(),
-                                "_NET_SUPPORTING_WM_CHECK",
-                                &wm_window)) {
+  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.
   gdk_error_trap_push();
   int wm_window_property = 0;
-  bool result = x11_util::GetIntProperty(
+  bool result = GetIntProperty(
       wm_window, "_NET_SUPPORTING_WM_CHECK", &wm_window_property);
   gdk_flush();
   bool got_error = gdk_error_trap_pop();
   if (got_error || !result || wm_window_property != wm_window)
     return false;
 
   gdk_error_trap_push();
-  result = x11_util::GetStringProperty(
+  result = GetStringProperty(
       static_cast<XID>(wm_window), "_NET_WM_NAME", wm_name);
   gdk_flush();
   got_error = gdk_error_trap_pop();
   return !got_error && result;
 }
 
 static cairo_status_t SnapshotCallback(
     void *closure, const unsigned char *data, unsigned int length) {
   std::vector<unsigned char>* png_representation =
       static_cast<std::vector<unsigned char>*>(closure);
@@ skipping 187 matching lines @@
   return base::StringPrintf(
       "X Error detected: serial %lu, error_code %u (%s), "
       "request_code %u minor_code %u (%s)",
       error_event->serial, error_event->error_code, error_str,
       error_event->request_code, error_event->minor_code, request_str);
 }
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
-}  // namespace x11_util
+}  // namespace ui