aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it.

base/message_pump_aurax11.h

Index: base/message_pump_aurax11.h
diff --git a/base/message_pump_x.h b/base/message_pump_aurax11.h
similarity index 68%
rename from base/message_pump_x.h
rename to base/message_pump_aurax11.h
index c9cfda865e4f9a28202ba82767ea863b954009b2..164f89d91c216b3113d6014a233f6ef9c214e817 100644
--- a/base/message_pump_x.h
+++ b/base/message_pump_aurax11.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_MESSAGE_PUMP_X_H
-#define BASE_MESSAGE_PUMP_X_H
+#ifndef BASE_MESSAGE_PUMP_AURAX11_H
+#define BASE_MESSAGE_PUMP_AURAX11_H
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_pump.h"
@@ -15,18 +15,39 @@
 
 #include <glib.h>
 
+typedef unsigned long    Atom;
 typedef struct _XDisplay Display;
 
 namespace base {
 
+namespace atom {
+
+// Names of cached atoms that we fetch from X11AtomCache. Adding an entry here
+// also requires adding an entry in the cc file.
+enum Name {
+  WM_DELETE_WINDOW = 0,
+  _NET_WM_MOVERESIZE,
+  _NET_WM_PING,
+  _NET_WM_PID,
+  WM_S0,
+  _MOTIF_WM_HINTS,
+
+  ATOM_COUNT
+};
+
+} // namespace atom
+
 // This class implements a message-pump for dispatching X events.
-class BASE_EXPORT MessagePumpX : public MessagePumpGlib {
+class BASE_EXPORT MessagePumpAuraX11 : public MessagePumpGlib {
  public:
-  MessagePumpX();
+  MessagePumpAuraX11();
 
   // Returns default X Display.
   static Display* GetDefaultXDisplay();
 
+  // Returns an atom on the default X Display.
+  static ::Atom GetAtom(atom::Name name);
+
   // Returns true if the system supports XINPUT2.
   static bool HasXInput2();
 
@@ -38,7 +59,7 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib {
   gboolean DispatchXEvents();
 
  protected:
-  virtual ~MessagePumpX();
+  virtual ~MessagePumpAuraX11();
 
  private:
   // Initializes the glib event source for X.
@@ -60,11 +81,11 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib {
   // The poll attached to |x_source_|.
   scoped_ptr<GPollFD> x_poll_;
 
-  DISALLOW_COPY_AND_ASSIGN(MessagePumpX);
+  DISALLOW_COPY_AND_ASSIGN(MessagePumpAuraX11);
 };
 
-typedef MessagePumpX MessagePumpForUI;
+typedef MessagePumpAuraX11 MessagePumpForUI;
 
 }  // namespace base
 
-#endif  // BASE_MESSAGE_PUMP_X_H
+#endif  // BASE_MESSAGE_PUMP_AURAX11_H