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

chrome/browser/chromeos/login/screen_locker.cc

 // Copyright (c) 2010 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/chromeos/login/screen_locker.h"
 
 #include <gdk/gdkx.h>
 #include <string>
 #include <vector>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
 // Evil hack to undo X11 evil #define. See crosbug.com/
 #undef Status
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/x11_util.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
+#include "ui/base/x/x11_util.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
 namespace {
 
 // The maximum duration for which locker should try to grab the keyboard and
 // mouse and its interval for regrabbing on failure.
 const int kMaxGrabFailureSec = 30;
 const int64 kRetryGrabIntervalMs = 500;
@@ skipping 336 matching lines @@
     screen_locker_->OnGrabInputs();
   }
 }
 
 void GrabWidget::TryUngrabOtherClients() {
 #if !defined(NDEBUG)
   {
     int event_base, error_base;
     int major, minor;
     // Make sure we have XTest extension.
-    DCHECK(XTestQueryExtension(x11_util::GetXDisplay(),
+    DCHECK(XTestQueryExtension(ui::GetXDisplay(),
                                &event_base, &error_base,
                                &major, &minor));
   }
 #endif
 
   // The following code is an attempt to grab inputs by closing
   // supposedly opened menu. This happens when a plugin has a menu
   // opened.
   if (mouse_grab_status_ == GDK_GRAB_ALREADY_GRABBED ||
       mouse_grab_status_ == GDK_GRAB_FROZEN) {
     // Successfully grabbed the keyboard, but pointer is still
     // grabbed by other client. Another attempt to close supposedly
     // opened menu by emulating keypress at the left top corner.
-    Display* display = x11_util::GetXDisplay();
+    Display* display = ui::GetXDisplay();
     Window root, child;
     int root_x, root_y, win_x, winy;
     unsigned int mask;
     XQueryPointer(display,
-                  x11_util::GetX11WindowFromGtkWidget(window_contents()),
+                  ui::GetX11WindowFromGtkWidget(window_contents()),
                   &root, &child, &root_x, &root_y,
                   &win_x, &winy, &mask);
     XTestFakeMotionEvent(display, -1, -10000, -10000, CurrentTime);
     XTestFakeButtonEvent(display, 1, True, CurrentTime);
     XTestFakeButtonEvent(display, 1, False, CurrentTime);
     // Move the pointer back.
     XTestFakeMotionEvent(display, -1, root_x, root_y, CurrentTime);
     XFlush(display);
   } else if (kbd_grab_status_ == GDK_GRAB_ALREADY_GRABBED ||
              kbd_grab_status_ == GDK_GRAB_FROZEN) {
     // Successfully grabbed the pointer, but keyboard is still grabbed
     // by other client. Another attempt to close supposedly opened
     // menu by emulating escape key.  Such situation must be very
     // rare, but handling this just in case
-    Display* display = x11_util::GetXDisplay();
+    Display* display = ui::GetXDisplay();
     KeyCode escape = XKeysymToKeycode(display, XK_Escape);
     XTestFakeKeyEvent(display, escape, True, CurrentTime);
     XTestFakeKeyEvent(display, escape, False, CurrentTime);
     XFlush(display);
   }
 }
 
 // BackgroundView for ScreenLocker, which layouts a lock widget in
 // addition to other background components.
 class ScreenLockerBackgroundView
@@ skipping 664 matching lines @@
 
 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!background_view_->IsScreenSaverVisible()) {
     StartScreenSaver();
     return true;
   }
   return false;
 }
 
 }  // namespace chromeos