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 /ui/aura/root_window_host_linux.cc | |
| 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 'ui/aura/root_window_host_linux.cc')
| -rw-r--r-- | ui/aura/root_window_host_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc index 17a370ca..1162638 100644 --- a/ui/aura/root_window_host_linux.cc +++ b/ui/aura/root_window_host_linux.cc @@ -13,7 +13,7 @@ #include <X11/extensions/Xrandr.h> #include <algorithm> -#include "base/message_pump_x.h" +#include "base/message_pump_aurax11.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "grit/ui_resources_standard.h" @@ -392,7 +392,7 @@ class RootWindowHostLinux::ImageCursors { RootWindowHostLinux::RootWindowHostLinux(const gfx::Rect& bounds) : root_window_(NULL), - xdisplay_(base::MessagePumpX::GetDefaultXDisplay()), + xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()), xwindow_(0), x_root_window_(DefaultRootWindow(xdisplay_)), current_cursor_(ui::kCursorNull), @@ -962,7 +962,7 @@ RootWindowHost* RootWindowHost::GetForAcceleratedWidget( // static gfx::Size RootWindowHost::GetNativeScreenSize() { - ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); + ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay(); return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); } |