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 /chromeos/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 'chromeos/display')
| -rw-r--r-- | chromeos/display/output_util.cc | 6 | ||||
| -rw-r--r-- | chromeos/display/real_output_configurator_delegate.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chromeos/display/output_util.cc b/chromeos/display/output_util.cc index 4800a2d..45f9b6a 100644 --- a/chromeos/display/output_util.cc +++ b/chromeos/display/output_util.cc @@ -39,7 +39,7 @@ bool IsRandRAvailable() { int randr_version_major = 0; int randr_version_minor = 0; static bool is_randr_available = XRRQueryVersion( - base::MessagePumpAuraX11::GetDefaultXDisplay(), + base::MessagePumpX11::GetDefaultXDisplay(), &randr_version_major, &randr_version_minor); return is_randr_available; } @@ -53,10 +53,10 @@ bool GetEDIDProperty(XID output, unsigned long* nitems, unsigned char** prop) { if (!IsRandRAvailable()) return false; - Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay(); + Display* display = base::MessagePumpX11::GetDefaultXDisplay(); static Atom edid_property = XInternAtom( - base::MessagePumpAuraX11::GetDefaultXDisplay(), + base::MessagePumpX11::GetDefaultXDisplay(), RR_PROPERTY_RANDR_EDID, false); bool has_edid_property = false; diff --git a/chromeos/display/real_output_configurator_delegate.cc b/chromeos/display/real_output_configurator_delegate.cc index 6d0c782..2788bd3 100644 --- a/chromeos/display/real_output_configurator_delegate.cc +++ b/chromeos/display/real_output_configurator_delegate.cc @@ -16,7 +16,7 @@ #include <utility> #include "base/logging.h" -#include "base/message_loop/message_pump_aurax11.h" +#include "base/message_loop/message_pump_x11.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/display/output_util.h" @@ -41,7 +41,7 @@ RRMode GetOutputNativeMode(const XRROutputInfo* output_info) { } // namespace RealOutputConfiguratorDelegate::RealOutputConfiguratorDelegate() - : display_(base::MessagePumpAuraX11::GetDefaultXDisplay()), + : display_(base::MessagePumpX11::GetDefaultXDisplay()), window_(DefaultRootWindow(display_)), screen_(NULL), is_panel_fitting_enabled_(false) { |