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

chrome/browser/chromeos/login/background_view.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/chromeos/login/background_view.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/x11_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/shutdown_button.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/views/window.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.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/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/screen.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/window.h"
 
 // X Windows headers have "#define Status int". That interferes with
 // NetworkLibrary header which defines enum "Status".
 #include <X11/cursorfont.h>  // NOLINT
 #include <X11/Xcursor/Xcursor.h>  // NOLINT
@@ skipping 43 matching lines @@
     return gfx::GetCursor(GDK_HAND2);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TextButtonWithHandCursorOver);
 };
 
 // This gets rid of the ugly X default cursor.
 static void ResetXCursor() {
   // TODO(sky): nuke this once new window manager is in place.
-  Display* display = x11_util::GetXDisplay();
+  Display* display = ui::GetXDisplay();
   Cursor cursor = XCreateFontCursor(display, XC_left_ptr);
-  XID root_window = x11_util::GetX11RootWindow();
+  XID root_window = ui::GetX11RootWindow();
   XSetWindowAttributes attr;
   attr.cursor = cursor;
   XChangeWindowAttributes(display, root_window, CWCursor, &attr);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 334 matching lines @@
             kBootTimesNoChromeExec,
             boot_times.total,
             boot_times.pre_startup,
             boot_times.system);
   }
   // Use UTF8ToWide once this string is localized.
   boot_times_label_->SetText(ASCIIToWide(boot_times_text));
 }
 
 }  // namespace chromeos