diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 16:43:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 16:43:56 +0000 |
| commit | 629569182b38946119b2e7a013725e08b55a4d85 (patch) | |
| tree | 533bbccc910ec007653584f6c53d264d73ad6cd8 /ash/display | |
| parent | ccce6e2f7320e12d0e0c312ed122413f9fda2ea2 (diff) | |
| download | chromium_src-629569182b38946119b2e7a013725e08b55a4d85.zip chromium_src-629569182b38946119b2e7a013725e08b55a4d85.tar.gz chromium_src-629569182b38946119b2e7a013725e08b55a4d85.tar.bz2 | |
x11: Prefer using ui::GetXDisplay() over getting the Display from the X11 message-pump.
BUG=none
R=oshima@chromium.org
Review URL: https://codereview.chromium.org/23622035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 1a338fe..e923219e 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -34,6 +34,10 @@ #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/native_widget_types.h" +#if defined(USE_X11) +#include "ui/base/x/x11_util.h" +#endif + namespace ash { namespace internal { namespace { @@ -43,8 +47,7 @@ namespace { void DisableInput(XID window) { long event_mask = ExposureMask | VisibilityChangeMask | StructureNotifyMask | PropertyChangeMask; - XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(), - window, event_mask); + XSelectInput(ui::GetXDisplay(), window, event_mask); } #endif |