Desktop aura: Put x11 cache in aura, instead of ui/base/x/.

ui/aura/env.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/client/stacking_client.h"
 
+#if defined(USE_X11)
+#include "ui/aura/x11_atom_cache.h"
+#endif
+
 namespace aura {
 
 class EnvObserver;
 class MonitorManager;
 class Window;
 
 namespace internal {
 class MonitorChangeObserverX11;
 }
 
@@ skipping 23 matching lines @@
   client::StackingClient* stacking_client() { return stacking_client_; }
   void set_stacking_client(client::StackingClient* stacking_client) {
     stacking_client_ = stacking_client;
   }
 
   // Gets/sets MonitorManager. The MonitorManager's ownership is
   // transfered.
   MonitorManager* monitor_manager() { return monitor_manager_.get(); }
   void SetMonitorManager(MonitorManager* monitor_manager);
 
+#if defined(USE_X11)
+  // Gets the X11 atom cache. This must not persist the cache across
+  // Env::DeleteInstance() calls.
+  X11AtomCache* atom_cache() { return &atom_cache_; }
+#endif
+
   // Returns the native event dispatcher. The result should only be passed to
   // MessageLoopForUI::RunWithDispatcher() or
   // MessageLoopForUI::RunAllPendingWithDispatcher(), or used to dispatch
   // an event by |Dispatch(const NativeEvent&)| on it. It must never be stored.
 #if !defined(OS_MACOSX)
   MessageLoop::Dispatcher* GetDispatcher();
 #endif
 
  private:
   friend class Window;
 
   void Init();
 
   // Called by the Window when it is initialized. Notifies observers.
   void NotifyWindowInitialized(Window* window);
 
   ObserverList<EnvObserver> observers_;
 #if !defined(OS_MACOSX)
   scoped_ptr<MessageLoop::Dispatcher> dispatcher_;
 #endif
 
   static Env* instance_;
   int mouse_button_flags_;
   client::StackingClient* stacking_client_;
   scoped_ptr<MonitorManager> monitor_manager_;
 
 #if defined(USE_X11)
   scoped_ptr<internal::MonitorChangeObserverX11> monitor_change_observer_;
+  X11AtomCache atom_cache_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_