Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ui/aura/env.h

Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 50d373a72599210a8d1b3d3fbd851c1cd0a7638d..48ff53337d83073758753917af6aff4fa7231c9b 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -21,13 +21,8 @@
 namespace aura {
 class EnvObserver;
 class EventFilter;
-class DisplayManager;
 class Window;
 
-namespace internal {
-class DisplayChangeObserverX11;
-}
-
 #if !defined(USE_X11)
 // Creates a platform-specific native event dispatcher.
 MessageLoop::Dispatcher* CreateDispatcher();
@@ -77,11 +72,6 @@ class AURA_EXPORT Env : public ui::EventTarget {
     stacking_client_ = stacking_client;
   }
 
-  // Gets/sets DisplayManager. The DisplayManager's ownership is
-  // transfered.
-  DisplayManager* display_manager() { return display_manager_.get(); }
-  void SetDisplayManager(DisplayManager* display_manager);
-
   // Returns the native event dispatcher. The result should only be passed to
   // base::RunLoop(dispatcher), or used to dispatch an event by
   // |Dispatch(const NativeEvent&)| on it. It must never be stored.
@@ -116,10 +106,8 @@ class AURA_EXPORT Env : public ui::EventTarget {
   bool is_touch_down_;
   bool render_white_bg_;
   client::StackingClient* stacking_client_;
-  scoped_ptr<DisplayManager> display_manager_;
 
 #if defined(USE_X11)
-  scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
   DeviceListUpdaterAuraX11 device_list_updater_aurax11_;
 #endif