Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/shell.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 ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 67 matching lines @@
 class UserWallpaperDelegate;
 class VideoDetector;
 class WebNotificationTray;
 class WindowCycleController;
 
 namespace internal {
 class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
+class DisplayChangeObserverX11;
+class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class FocusCycler;
 class MagnificationController;
 class MouseCursorEventFilter;
 class OutputConfiguratorAnimation;
 class OverlayEventFilter;
 class ResizeShadowController;
 class RootWindowController;
@@ skipping 162 matching lines @@
   // Adds/removes observer.
   void AddShellObserver(ShellObserver* observer);
   void RemoveShellObserver(ShellObserver* observer);
 
 #if !defined(OS_MACOSX)
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
 #endif  // !defined(OS_MACOSX)
 
+  internal::DisplayManager* display_manager() {
+    return display_manager_.get();
+  }
   aura::shared::CompoundEventFilter* env_filter() {
     return env_filter_.get();
   }
   internal::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   internal::EventRewriterEventFilter* event_rewriter_filter() {
     return event_rewriter_filter_.get();
   }
   internal::OverlayEventFilter* overlay_filter() {
@@ skipping 39 matching lines @@
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   internal::MagnificationController* magnification_controller() {
     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();
 
   // TODO(oshima): Define an interface to access shelf/launcher
   // state, or just use Launcher.
 
   // Sets/gets the shelf auto-hide behavior on |root_window|.
   void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
                                 aura::RootWindow* root_window);
@@ skipping 169 matching lines @@
   scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
 #endif
 
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
 
   // An event filter that silently keeps track of all touch events and controls
   // 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.

[Ben Goodger (Google), 2012/11/12 21:41:01]

Receives

[oshima, 2012/11/13 17:49:37]

Done.

+  scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
 #endif  // defined(OS_CHROMEOS)
 
   CursorManager cursor_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_