Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: ui/aura/root_window_host_linux.cc

Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error in file added in the interim Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/monitor_change_observer_x11.cc ('k') | ui/aura/ui_controls_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_host_linux.cc
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc
index 17a370ca6b4b7e03215b757f2b517af50bee50d3..116263808b39d47c7429b03e1d88bf4a41e4f9fd 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));
}
« no previous file with comments | « ui/aura/monitor_change_observer_x11.cc ('k') | ui/aura/ui_controls_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698