Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 41ce0dd2019367fc0f6d46e690fb19a4a1032177..10adc61609b2713b3ddc1ce246bf9e894fa416af 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -85,6 +85,8 @@ class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
+class DisplayChangeObserverX11;
+class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
@@ -267,6 +269,9 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   }
 #endif  // !defined(OS_MACOSX)
 
+  internal::DisplayManager* display_manager() {
+    return display_manager_.get();
+  }
   aura::shared::CompoundEventFilter* env_filter() {
     return env_filter_.get();
   }
@@ -326,7 +331,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
     return magnification_controller_.get();
   }
 
-  const ScreenAsh* screen() { return screen_; }
+  ScreenAsh* screen() { return screen_; }
 
   // Force the shelf to query for it's current visibility state.
   void UpdateShelfVisibility();
@@ -516,11 +521,16 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
   scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
 
+  scoped_ptr<internal::DisplayManager> display_manager_;
+
 #if defined(OS_CHROMEOS)
   // Controls video output device state.
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
+
+  // Recieves output change events and udpates the display manager.
+  scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
 #endif  // defined(OS_CHROMEOS)
 
   CursorManager cursor_manager_;