diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
| commit | c4eb2947a68a9ceb064f789ded6f06ce8a5b0497 (patch) | |
| tree | 6eccf6da9f8557688cd9b6f0c2de860b81824d89 /ash | |
| parent | f746ee6b3e71c5688a1f774faa0602799c7118d6 (diff) | |
| download | chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.zip chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.gz chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.bz2 | |
Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h
This is to break a dependency on ui/base from ui/compositor.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/23460052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_controller.cc | 3 | ||||
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 4 | ||||
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 3ab258b..11b2fc8 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -44,6 +44,7 @@ #include "ash/display/output_configurator_animation.h" #include "chromeos/display/output_configurator.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/x/x11_types.h" // Including this at the bottom to avoid other // potential conflict with chrome headers. @@ -824,7 +825,7 @@ void DisplayController::UpdateHostWindowNames() { std::string name = root_windows[i] == primary ? "aura_root_0" : "aura_root_x"; gfx::AcceleratedWidget xwindow = root_windows[i]->GetAcceleratedWidget(); - XStoreName(ui::GetXDisplay(), xwindow, name.c_str()); + XStoreName(gfx::GetXDisplay(), xwindow, name.c_str()); } #endif } diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 485e582..287b0e4 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -29,7 +29,7 @@ #include "ui/views/widget/widget.h" #if defined(USE_X11) -#include "ui/base/x/x11_util.h" +#include "ui/gfx/x/x11_types.h" #include <X11/Xlib.h> #undef RootWindow #endif @@ -288,7 +288,7 @@ void GetPrimaryAndSeconary(aura::RootWindow** primary, std::string GetXWindowName(aura::RootWindow* window) { char* name = NULL; - XFetchName(ui::GetXDisplay(), window->GetAcceleratedWidget(), &name); + XFetchName(gfx::GetXDisplay(), window->GetAcceleratedWidget(), &name); std::string ret(name); XFree(name); return ret; diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index e923219e..2de135a 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -35,7 +35,7 @@ #include "ui/gfx/native_widget_types.h" #if defined(USE_X11) -#include "ui/base/x/x11_util.h" +#include "ui/gfx/x/x11_types.h" #endif namespace ash { @@ -47,7 +47,7 @@ namespace { void DisableInput(XID window) { long event_mask = ExposureMask | VisibilityChangeMask | StructureNotifyMask | PropertyChangeMask; - XSelectInput(ui::GetXDisplay(), window, event_mask); + XSelectInput(gfx::GetXDisplay(), window, event_mask); } #endif |