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

chrome/browser/ui/gtk/gtk_util.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <cstdarg>
 #include <map>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/x11_util.h"
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/renderer_preferences.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/x/x11_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/native_dialog_window.h"
 #include "chrome/browser/chromeos/options/options_window_view.h"
 #include "views/window/window.h"
 #else
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #endif
 
@@ skipping 308 matching lines @@
     if (origin.x() < rect.x)
       origin.set_x(rect.x);
     if (origin.y() < rect.y)
       origin.set_y(rect.y);
   }
 
   gtk_window_move(window, origin.x(), origin.y());
 
   // Move to user expected desktop if window is already visible.
   if (GTK_WIDGET(window)->window) {
-    x11_util::ChangeWindowDesktop(
-        x11_util::GetX11WindowFromGtkWidget(GTK_WIDGET(window)),
-        x11_util::GetX11WindowFromGtkWidget(GTK_WIDGET(parent)));
+    ui::ChangeWindowDesktop(
+        ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window)),
+        ui::GetX11WindowFromGtkWidget(GTK_WIDGET(parent)));
   }
 }
 
 void MakeAppModalWindowGroup() {
 #if GTK_CHECK_VERSION(2, 14, 0)
   // Older versions of GTK+ don't give us gtk_window_group_list() which is what
   // we need to add current non-browser modal dialogs to the list. If
   // we have 2.14+ we can do things the correct way.
   GtkWindowGroup* window_group = gtk_window_group_new();
   for (BrowserList::const_iterator it = BrowserList::begin();
@@ skipping 158 matching lines @@
     gtk_box_pack_start(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, padding);
 
   return centering_vbox;
 }
 
 bool IsScreenComposited() {
   GdkScreen* screen = gdk_screen_get_default();
   return gdk_screen_is_composited(screen) == TRUE;
 }
 
-void EnumerateTopLevelWindows(x11_util::EnumerateWindowsDelegate* delegate) {
+void EnumerateTopLevelWindows(ui::EnumerateWindowsDelegate* delegate) {
   std::vector<XID> stack;
-  if (!x11_util::GetXWindowStack(&stack)) {
+  if (!ui::GetXWindowStack(&stack)) {
     // Window Manager doesn't support _NET_CLIENT_LIST_STACKING, so fall back
     // to old school enumeration of all X windows.  Some WMs parent 'top-level'
     // windows in unnamed actual top-level windows (ion WM), so extend the
     // search depth to all children of top-level windows.
     const int kMaxSearchDepth = 1;
-    x11_util::EnumerateAllWindows(delegate, kMaxSearchDepth);
+    ui::EnumerateAllWindows(delegate, kMaxSearchDepth);
     return;
   }
 
   std::vector<XID>::iterator iter;
   for (iter = stack.begin(); iter != stack.end(); iter++) {
     if (delegate->ShouldStopIterating(*iter))
       return;
   }
 }
 
@@ skipping 282 matching lines @@
   DCHECK(GTK_IS_WINDOW(toplevel) && GTK_WIDGET_TOPLEVEL(toplevel) &&
          GTK_WIDGET_REALIZED(toplevel));
 
   // Stack the |popup| window directly above the |toplevel| window.
   // The popup window is a direct child of the root window, so we need to
   // find a similar ancestor for the toplevel window (which might have been
   // reparented by a window manager).  We grab the server while we're doing
   // this -- otherwise, we'll get an error if the window manager reparents the
   // toplevel window right after we call GetHighestAncestorWindow().
   gdk_x11_display_grab(gtk_widget_get_display(toplevel));
-  XID toplevel_window_base = x11_util::GetHighestAncestorWindow(
-      x11_util::GetX11WindowFromGtkWidget(toplevel),
-      x11_util::GetX11RootWindow());
+  XID toplevel_window_base = ui::GetHighestAncestorWindow(
+      ui::GetX11WindowFromGtkWidget(toplevel),
+      ui::GetX11RootWindow());
   if (toplevel_window_base) {
-    XID window_xid = x11_util::GetX11WindowFromGtkWidget(popup);
-    XID window_parent = x11_util::GetParentWindow(window_xid);
-    if (window_parent == x11_util::GetX11RootWindow()) {
-      x11_util::RestackWindow(window_xid, toplevel_window_base, true);
+    XID window_xid = ui::GetX11WindowFromGtkWidget(popup);
+    XID window_parent = ui::GetParentWindow(window_xid);
+    if (window_parent == ui::GetX11RootWindow()) {
+      ui::RestackWindow(window_xid, toplevel_window_base, true);
     } else {
       // The window manager shouldn't reparent override-redirect windows.
       DLOG(ERROR) << "override-redirect window " << window_xid
                   << "'s parent is " << window_parent
                   << ", rather than root window "
-                  << x11_util::GetX11RootWindow();
+                  << ui::GetX11RootWindow();
     }
   }
   gdk_x11_display_ungrab(gtk_widget_get_display(toplevel));
 }
 
 gfx::Rect GetWidgetRectRelativeToToplevel(GtkWidget* widget) {
   DCHECK(GTK_WIDGET_REALIZED(widget));
 
   GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
   DCHECK(toplevel);
@@ skipping 357 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util