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

Unified Diff: ui/gfx/x/x11_atom_cache.cc

Issue 392153002: Remove X11/Xlib.h include from selection_requestor.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/gfx/x/x11_atom_cache.h ('k') | ui/gfx/x/x11_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/x/x11_atom_cache.cc
diff --git a/ui/gfx/x/x11_atom_cache.cc b/ui/gfx/x/x11_atom_cache.cc
index c9f52ca2aaa6ea979b00608269d620a58a799baa..cc5d5eb3f6a861beeb3b83a376452d7001a42edb 100644
--- a/ui/gfx/x/x11_atom_cache.cc
+++ b/ui/gfx/x/x11_atom_cache.cc
@@ -19,7 +19,7 @@ X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char** to_cache)
for (const char** i = to_cache; *i != NULL; i++)
cache_count++;
- scoped_ptr<Atom[]> cached_atoms(new Atom[cache_count]);
+ scoped_ptr<XAtom[]> cached_atoms(new XAtom[cache_count]);
// Grab all the atoms we need now to minimize roundtrips to the X11 server.
XInternAtoms(xdisplay_,
@@ -32,11 +32,11 @@ X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char** to_cache)
X11AtomCache::~X11AtomCache() {}
-Atom X11AtomCache::GetAtom(const char* name) const {
+XAtom X11AtomCache::GetAtom(const char* name) const {
std::map<std::string, Atom>::const_iterator it = cached_atoms_.find(name);
if (uncached_atoms_allowed_ && it == cached_atoms_.end()) {
- Atom atom = XInternAtom(xdisplay_, name, false);
+ XAtom atom = XInternAtom(xdisplay_, name, false);
cached_atoms_.insert(std::make_pair(name, atom));
return atom;
}
« no previous file with comments | « ui/gfx/x/x11_atom_cache.h ('k') | ui/gfx/x/x11_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698