Index: chrome/browser/chromeos/login/background_view.cc |
=================================================================== |
--- chrome/browser/chromeos/login/background_view.cc (revision 71854) |
+++ chrome/browser/chromeos/login/background_view.cc (working copy) |
@@ -9,7 +9,6 @@ |
#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" |
@@ -35,6 +34,7 @@ |
#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" |
@@ -98,9 +98,9 @@ |
// 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); |