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

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6257006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/chrome/browser/ui/tabs/dock_info_gtk.cc b/chrome/browser/ui/tabs/dock_info_gtk.cc
index abe02e7..402e79d 100644
--- a/chrome/browser/ui/tabs/dock_info_gtk.cc
+++ b/chrome/browser/ui/tabs/dock_info_gtk.cc
@@ -13,18 +13,19 @@
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/native_widget_types.h"
+#include "ui/base/x/x11_util.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // BaseWindowFinder
 //
 // Base class used to locate a window. A subclass need only override
 // ShouldStopIterating to determine when iteration should stop.
-class BaseWindowFinder : public x11_util::EnumerateWindowsDelegate {
+class BaseWindowFinder : public ui::EnumerateWindowsDelegate {
  public:
   explicit BaseWindowFinder(const std::set<GtkWidget*>& ignore) {
     std::set<GtkWidget*>::iterator iter;
     for (iter = ignore.begin(); iter != ignore.end(); iter++) {
-      XID xid = x11_util::GetX11WindowFromGtkWidget(*iter);
+      XID xid = ui::GetX11WindowFromGtkWidget(*iter);
       ignore_.insert(xid);
     }
   }
@@ -75,13 +76,13 @@ class TopMostFinder : public BaseWindowFinder {
       return true;
     }
 
-    if (!x11_util::IsWindowVisible(window)) {
+    if (!ui::IsWindowVisible(window)) {
       // The window isn't visible, keep iterating.
       return false;
     }
 
     gfx::Rect rect;
-    if (x11_util::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
+    if (ui::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
       // At this point we haven't found our target window, so this window is
       // higher in the z-order than the target window.  If this window contains
       // the point, then we can stop the search now because this window is
@@ -145,11 +146,11 @@ class LocalProcessWindowFinder : public BaseWindowFinder {
     if (!BrowserWindowGtk::GetBrowserWindowForXID(window))
       return false;
 
-    if (!x11_util::IsWindowVisible(window))
+    if (!ui::IsWindowVisible(window))
       return false;
 
     gfx::Rect rect;
-    if (x11_util::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
+    if (ui::GetWindowRect(window, &rect) && rect.Contains(screen_loc_)) {
       result_ = window;
       return true;
     }