diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 18:24:52 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 18:24:52 +0000 |
| commit | 0959cf50b0b0b1c7575e8e891dab27e73d66eaa3 (patch) | |
| tree | 3fc3d727c9a100fa42693031e5c867ea74ebc165 /ash/display | |
| parent | 6822fe43288a12ca51532204dc9b037a84e80b11 (diff) | |
| download | chromium_src-0959cf50b0b0b1c7575e8e891dab27e73d66eaa3.zip chromium_src-0959cf50b0b0b1c7575e8e891dab27e73d66eaa3.tar.gz chromium_src-0959cf50b0b0b1c7575e8e891dab27e73d66eaa3.tar.bz2 | |
Revert 223621 "x11: Prefer using ui::GetXDisplay() over getting ..."
> 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
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/23943010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index e923219e..1a338fe 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -34,10 +34,6 @@ #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 { @@ -47,7 +43,8 @@ namespace { void DisableInput(XID window) { long event_mask = ExposureMask | VisibilityChangeMask | StructureNotifyMask | PropertyChangeMask; - XSelectInput(ui::GetXDisplay(), window, event_mask); + XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(), + window, event_mask); } #endif |