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

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

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/base/x/x11_util.cc ('k') | ui/gfx/x/x11_atom_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/x/x11_atom_cache.h
diff --git a/ui/gfx/x/x11_atom_cache.h b/ui/gfx/x/x11_atom_cache.h
index 6a29df720c6fec9bd54f90b5c8d5e3daec287d30..92d4db799b06ed8912248bee025a30306ee459c0 100644
--- a/ui/gfx/x/x11_atom_cache.h
+++ b/ui/gfx/x/x11_atom_cache.h
@@ -10,9 +10,7 @@
#include "base/basictypes.h"
#include "ui/gfx/gfx_export.h"
-
-typedef unsigned long Atom;
-typedef struct _XDisplay XDisplay;
+#include "ui/gfx/x/x11_types.h"
namespace ui {
@@ -27,7 +25,7 @@ class GFX_EXPORT X11AtomCache {
~X11AtomCache();
// Returns the pre-interned Atom without having to go to the x server.
- Atom GetAtom(const char*) const;
+ XAtom GetAtom(const char*) const;
// When an Atom isn't in the list of items we've cached, we should look it
// up, cache it locally, and then return the result.
@@ -38,7 +36,7 @@ class GFX_EXPORT X11AtomCache {
bool uncached_atoms_allowed_;
- mutable std::map<std::string, Atom> cached_atoms_;
+ mutable std::map<std::string, XAtom> cached_atoms_;
DISALLOW_COPY_AND_ASSIGN(X11AtomCache);
};
« no previous file with comments | « ui/base/x/x11_util.cc ('k') | ui/gfx/x/x11_atom_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698