diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 04:05:19 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 04:05:19 +0000 |
| commit | 0cc4e1c917cd8829fa2f420d7cabfd61602257cc (patch) | |
| tree | 9981f86fa876b441da7fc470a63c6232097726ad /ash | |
| parent | bce1e260e60bd3a8afb0011933901a2b193613e5 (diff) | |
| download | chromium_src-0cc4e1c917cd8829fa2f420d7cabfd61602257cc.zip chromium_src-0cc4e1c917cd8829fa2f420d7cabfd61602257cc.tar.gz chromium_src-0cc4e1c917cd8829fa2f420d7cabfd61602257cc.tar.bz2 | |
Reland 223621: x11: Prefer using ui::GetXDisplay() to getting the Display from the X11 message pump.
The CL was previously reverted in r223639 because of timeouts in
WebContentsImplBrowserTest.GetSizeForNewRenderView. A proper fix for that has
landed in r223775. So it should be safe to reland r223621.
BUG=none
TBR=nasko@chromium.org, oshima@chromium.org
Review URL: https://codereview.chromium.org/23456041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -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 |