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

Unified Diff: ui/views/widget/x11_window_event_filter.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/base/x/events_x.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/x11_window_event_filter.cc
diff --git a/ui/views/widget/x11_window_event_filter.cc b/ui/views/widget/x11_window_event_filter.cc
index 7471c3236d4a853b747760ed6228e1c357518105..5553f952a5abec2ecde7d5e178a1b129e861987a 100644
--- a/ui/views/widget/x11_window_event_filter.cc
+++ b/ui/views/widget/x11_window_event_filter.cc
@@ -7,7 +7,7 @@
#include <X11/extensions/XInput.h>
#include <X11/extensions/XInput2.h>
-#include "base/message_pump_x.h"
+#include "base/message_pump_aurax11.h"
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window_delegate.h"
@@ -55,7 +55,7 @@ namespace views {
X11WindowEventFilter::X11WindowEventFilter(aura::RootWindow* root_window)
: root_window_(root_window),
- xdisplay_(base::MessagePumpX::GetDefaultXDisplay()),
+ xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
xwindow_(root_window_->GetAcceleratedWidget()),
x_root_window_(DefaultRootWindow(xdisplay_)),
atom_cache_(xdisplay_, kAtomsToCache) {
@@ -70,7 +70,7 @@ void X11WindowEventFilter::SetUseHostWindowBorders(bool use_os_border) {
motif_hints.decorations = use_os_border ? 1 : 0;
::Atom hint_atom = atom_cache_.GetAtom("_MOTIF_WM_HINTS");
- XChangeProperty(base::MessagePumpX::GetDefaultXDisplay(),
+ XChangeProperty(base::MessagePumpAuraX11::GetDefaultXDisplay(),
xwindow_,
hint_atom,
hint_atom,
« no previous file with comments | « ui/base/x/events_x.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698