diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-07 03:21:04 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-07 03:21:04 +0000 |
| commit | bb99d70f77e537ffc7ec0921d90c13e3cf689615 (patch) | |
| tree | 931c34246bed527a838c19a52864483b114335f4 /ash/display | |
| parent | 214a88cc01c887c3b3d7d21b76867871203087dd (diff) | |
| download | chromium_src-bb99d70f77e537ffc7ec0921d90c13e3cf689615.zip chromium_src-bb99d70f77e537ffc7ec0921d90c13e3cf689615.tar.gz chromium_src-bb99d70f77e537ffc7ec0921d90c13e3cf689615.tar.bz2 | |
gtk: Allow building both the X11 and Gtk message-pumps for gtk.
This patch allows both the X11 and the Gtk message-pumps to be built
in a linux-gtk build. A subsequent patch will use the X11 message-pump
for the GPU process, while continue to use the Gtk message-pump for the
browser process.
BUG=145600
R=ccameron@chromium.org, oshima@chromium.org, piman@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/23880006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 8fa0833..32d3874 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -43,7 +43,7 @@ namespace { void DisableInput(XID window) { long event_mask = ExposureMask | VisibilityChangeMask | StructureNotifyMask | PropertyChangeMask; - XSelectInput(base::MessagePumpAuraX11::GetDefaultXDisplay(), + XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(), window, event_mask); } #endif |