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

chrome/browser/chromeos/wm_ipc.cc

Index: chrome/browser/chromeos/wm_ipc.cc
===================================================================
--- chrome/browser/chromeos/wm_ipc.cc	(revision 71854)
+++ chrome/browser/chromeos/wm_ipc.cc	(working copy)
@@ -9,10 +9,10 @@
 #include <X11/Xlib.h>
 }
 
-#include "app/x11_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "ui/base/x/x11_util.h"
 
 namespace chromeos {
 
@@ -45,7 +45,7 @@
     data[i] = values[i];
 
   // TODO: Trap errors and return false on failure.
-  XChangeProperty(x11_util::GetXDisplay(),
+  XChangeProperty(ui::GetXDisplay(),
                   xid,
                   xatom,
                   xatom,
@@ -53,7 +53,7 @@
                   PropModeReplace,
                   reinterpret_cast<const unsigned char*>(data.get()),
                   values.size());  // num items
-  XFlush(x11_util::GetXDisplay());
+  XFlush(ui::GetXDisplay());
   return true;
 }
 
@@ -73,15 +73,15 @@
   values.push_back(type);
   if (params)
     values.insert(values.end(), params->begin(), params->end());
-  return SetIntProperty(x11_util::GetX11WindowFromGtkWidget(widget),
+  return SetIntProperty(ui::GetX11WindowFromGtkWidget(widget),
                         type_to_atom_[ATOM_CHROME_WINDOW_TYPE], values);
 }
 
 WmIpcWindowType WmIpc::GetWindowType(GtkWidget* widget,
                                      std::vector<int>* params) {
   std::vector<int> properties;
-  if (x11_util::GetIntArrayProperty(
-          x11_util::GetX11WindowFromGtkWidget(widget),
+  if (ui::GetIntArrayProperty(
+          ui::GetX11WindowFromGtkWidget(widget),
           atom_to_string_[type_to_atom_[ATOM_CHROME_WINDOW_TYPE]],
           &properties)) {
     int type = properties.front();
@@ -109,7 +109,7 @@
   for (int i = 0; i < msg.max_params(); ++i)
     e.xclient.data.l[i+1] = msg.param(i);
 
-  XSendEvent(x11_util::GetXDisplay(),
+  XSendEvent(ui::GetXDisplay(),
              wm_,
              False,  // propagate
              0,  // empty event mask
@@ -177,7 +177,7 @@
     names[i] = const_cast<char*>(kAtomInfos[i].name);
   }
 
-  XInternAtoms(x11_util::GetXDisplay(), names.get(), kNumAtoms,
+  XInternAtoms(ui::GetXDisplay(), names.get(), kNumAtoms,
                False,  // only_if_exists
                atoms.get());
 
@@ -200,7 +200,7 @@
 }
 
 void WmIpc::InitWmInfo() {
-  wm_ = XGetSelectionOwner(x11_util::GetXDisplay(), type_to_atom_[ATOM_WM_S0]);
+  wm_ = XGetSelectionOwner(ui::GetXDisplay(), type_to_atom_[ATOM_WM_S0]);
 
   // Let the window manager know which version of the IPC messages we support.
   Message msg(chromeos::WM_IPC_MESSAGE_WM_NOTIFY_IPC_VERSION);