diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:25:38 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:25:38 +0000 |
| commit | 1a24da5da18bac1e97ede472e0061568c4b76f26 (patch) | |
| tree | 68f27982963c4c71ff73ad2f735e257ffb9d4212 /content | |
| parent | f192729f8de098c357422f74fe6c0a530a9e90db (diff) | |
| download | chromium_src-1a24da5da18bac1e97ede472e0061568c4b76f26.zip chromium_src-1a24da5da18bac1e97ede472e0061568c4b76f26.tar.gz chromium_src-1a24da5da18bac1e97ede472e0061568c4b76f26.tar.bz2 | |
aura/cros: Rename MessagePump{X => AuraX11}.
So rename the MessagePumpX, which is an aurax11 only class now to MessagePumpAuraX11 (which also simplifies the gyp files).
BUG=129075
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10441028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/power_save_blocker_linux.cc | 8 | ||||
| -rw-r--r-- | content/common/gpu/media/gles2_texture_to_egl_image_translator.cc | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/content/browser/power_save_blocker_linux.cc b/content/browser/power_save_blocker_linux.cc index b0c3ae0..776e0a6 100644 --- a/content/browser/power_save_blocker_linux.cc +++ b/content/browser/power_save_blocker_linux.cc @@ -25,7 +25,7 @@ #if defined(TOOLKIT_GTK) #include "base/message_pump_gtk.h" #else -#include "base/message_pump_x.h" +#include "base/message_pump_aurax11.h" #endif #include "base/nix/xdg_util.h" #include "content/public/browser/browser_thread.h" @@ -481,11 +481,7 @@ DBusPowerSaveBlocker::~DBusPowerSaveBlocker() { // static bool DBusPowerSaveBlocker::DPMSEnabled() { -#if defined(TOOLKIT_GTK) - Display* display = base::MessagePumpGtk::GetDefaultXDisplay(); -#else - Display* display = base::MessagePumpX::GetDefaultXDisplay(); -#endif + Display* display = base::MessagePumpForUI::GetDefaultXDisplay(); BOOL enabled = false; int dummy; if (DPMSQueryExtension(display, &dummy, &dummy) && DPMSCapable(display)) { diff --git a/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc index 18701e8..e1ac517 100644 --- a/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc +++ b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc @@ -5,8 +5,11 @@ #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" #include "base/logging.h" -#include "base/message_pump_x.h" - +#if defined(TOOLKIT_USES_GTK) +#include "base/message_pump_gtk.h" +#elif defined(USE_AURA) +#include "base/message_pump_aurax11.h" +#endif // Get EGL extension functions. static PFNEGLCREATEIMAGEKHRPROC egl_create_image_khr = |