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

Unified Diff: ui/aura/x11_atom_cache.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/ui_controls_x11.cc ('k') | ui/base/x/events_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/x11_atom_cache.cc
diff --git a/ui/aura/x11_atom_cache.cc b/ui/aura/x11_atom_cache.cc
index 542266f4e8c997dc3a305408c80e2385ceba441c..9da1e529e5de5c932899456d4e04b3e57796489f 100644
--- a/ui/aura/x11_atom_cache.cc
+++ b/ui/aura/x11_atom_cache.cc
@@ -6,8 +6,8 @@
#include <X11/Xatom.h>
+#include "base/message_pump_aurax11.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_pump_x.h"
namespace aura {
@@ -20,7 +20,7 @@ X11AtomCache::X11AtomCache(Display* xdisplay, const char** to_cache)
scoped_array< ::Atom> cached_atoms(new ::Atom[cache_count]);
// Grab all the atoms we need now to minimize roundtrips to the X11 server.
- XInternAtoms(base::MessagePumpX::GetDefaultXDisplay(),
+ XInternAtoms(base::MessagePumpAuraX11::GetDefaultXDisplay(),
const_cast<char**>(to_cache), cache_count, False,
cached_atoms.get());
« no previous file with comments | « ui/aura/ui_controls_x11.cc ('k') | ui/base/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698