| 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 fefa64205d06e404b75675cabe32b3f603f4e4bb..4a63fe35df1371985601005cfbca8def4d078a34 100644
|
| --- a/ui/gfx/x/x11_atom_cache.h
|
| +++ b/ui/gfx/x/x11_atom_cache.h
|
| @@ -5,13 +5,12 @@
|
| #ifndef UI_GFX_X_X11_ATOM_CACHE_H_
|
| #define UI_GFX_X_X11_ATOM_CACHE_H_
|
|
|
| -#include "base/basictypes.h"
|
| -#include "ui/gfx/gfx_export.h"
|
| -
|
| #include <map>
|
| #include <string>
|
|
|
| -#include <X11/Xlib.h>
|
| +#include "base/basictypes.h"
|
| +#include "ui/gfx/gfx_export.h"
|
| +#include "ui/gfx/x/x11_types.h"
|
|
|
| // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
|
| #undef RootWindow
|
| @@ -25,7 +24,7 @@ namespace ui {
|
| class GFX_EXPORT X11AtomCache {
|
| public:
|
| // Preinterns the NULL terminated list of string |to_cache_ on |xdisplay|.
|
| - X11AtomCache(Display* xdisplay, const char** to_cache);
|
| + X11AtomCache(XDisplay* xdisplay, const char** to_cache);
|
| ~X11AtomCache();
|
|
|
| // Returns the pre-interned Atom without having to go to the x server.
|
| @@ -36,11 +35,11 @@ class GFX_EXPORT X11AtomCache {
|
| void allow_uncached_atoms() { uncached_atoms_allowed_ = true; }
|
|
|
| private:
|
| - Display* xdisplay_;
|
| + XDisplay* xdisplay_;
|
|
|
| bool uncached_atoms_allowed_;
|
|
|
| - mutable std::map<std::string, ::Atom> cached_atoms_;
|
| + mutable std::map<std::string, Atom> cached_atoms_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(X11AtomCache);
|
| };
|
|
|