MultiMonitor support

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_
 #pragma once
 
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "ui/aura/monitor_manager.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/insets.h"
 
 class CommandLine;
 class SkBitmap;
 
 namespace aura {
 class EventFilter;
+class Monitor;
 class RootWindow;
 class Window;
 }
 namespace gfx {
 class Point;
 class Rect;
 }
 namespace ui {
 class Layer;
 }
@@ skipping 17 matching lines @@
 class VideoDetector;
 class WindowCycleController;
 
 namespace internal {
 class ActivationController;
 class AcceleratorFilter;
 class AppList;
 class DragDropController;
 class FocusCycler;
 class InputMethodEventFilter;
+class MonitorController;
 class PartialScreenshotEventFilter;
 class ResizeShadowController;
 class RootWindowEventFilter;
 class RootWindowLayoutManager;
 class ShadowController;
 class ShelfLayoutManager;
 class StackingController;
 class TooltipController;
 class VisibilityController;
 class WindowModalityController;
 class WorkspaceController;
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 //
 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
 // takes ownership of the Shell.
-class ASH_EXPORT Shell : public aura::MonitorObserver {
+class ASH_EXPORT Shell {
  public:
   enum Direction {
     FORWARD,
     BACKWARD
   };
 
   // Accesses private data from a Shell for testing.
   class ASH_EXPORT TestApi {
    public:
     explicit TestApi(Shell* shell);
@@ skipping 102 matching lines @@
 
   const ScreenAsh* screen() { return screen_; }
 
   internal::ShelfLayoutManager* shelf() const { return shelf_; }
 
   SystemTray* tray() const { return tray_.get(); }
 
   // Returns the size of the grid.
   int GetGridSize() const;
 
-  // aura::MonitorObserver overrides:
-  virtual void OnMonitorBoundsChanged(const aura::Monitor* monitor) OVERRIDE;
-
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
 
   internal::ResizeShadowController* resize_shadow_controller() {
     return resize_shadow_controller_.get();
   }
 
   // Made available for tests.
   internal::ShadowController* shadow_controller() {
@@ skipping 50 matching lines @@
   scoped_ptr<internal::WorkspaceController> workspace_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
+  scoped_ptr<internal::MonitorController> monitor_controller_;
 
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
 
   // An event filter that pre-handles key events while the partial
   // screenshot UI is active.
   scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
 
 #if !defined(OS_MACOSX)
   // An event filter that pre-handles global accelerators.
@@ skipping 16 matching lines @@
   // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
   // |status_widget_|).
   scoped_ptr<SystemTray> tray_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_