MultiMonitor support

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
+#include "ash/monitor/multi_monitor_manager.h"
+#include "ash/monitor/monitor_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/ime/tray_ime.h"
 #include "ash/system/network/tray_network.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/power/power_supply_status.h"
@@ skipping 374 matching lines @@
 }
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
   return shell_->workspace_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
-    : root_window_(aura::Env::GetInstance()->monitor_manager()->
-                   CreateRootWindowForPrimaryMonitor()),
+    : root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()),
       screen_(new ScreenAsh(root_window_.get())),
       root_filter_(NULL),
       delegate_(delegate),
       shelf_(NULL),
       root_window_layout_(NULL),
       status_widget_(NULL) {
   gfx::Screen::SetInstance(screen_);
   ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
-  aura::Env::GetInstance()->monitor_manager()->AddObserver(this);
 }
 
 Shell::~Shell() {
-  aura::Env::GetInstance()->monitor_manager()->RemoveObserver(this);
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 #endif
 
   // Close background widget now so that the focus manager of the
   // widget gets deleted in the final message loop run.
   root_window_layout_->SetBackgroundWidget(NULL);
@@ skipping 18 matching lines @@
   }
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical.
   activation_controller_.reset();
   drag_drop_controller_.reset();
   resize_shadow_controller_.reset();
   shadow_controller_.reset();
   window_cycle_controller_.reset();
+  monitor_controller_.reset();
 
   // Launcher widget has a InputMethodBridge that references to
   // input_method_filter_'s input_method_. So explicitly release launcher_
   // before input_method_filter_. And this needs to be after we delete all
   // containers in case there are still live browser windows which access
   // LauncherModel during close.
   launcher_.reset();
 
   DCHECK(instance_ == this);
   instance_ = NULL;
 }
 
 // static
 Shell* Shell::CreateInstance(ShellDelegate* delegate) {
   CHECK(!instance_);
+  aura::Env::GetInstance()->SetMonitorManager(
+      new internal::MultiMonitorManager());
   instance_ = new Shell(delegate);
   instance_->Init();
   return instance_;
 }
 
 // static
 Shell* Shell::GetInstance() {
   DCHECK(instance_);
   return instance_;
 }
@@ skipping 137 matching lines @@
 
   visibility_controller_.reset(new internal::VisibilityController);
 
   tooltip_controller_.reset(new internal::TooltipController);
   AddRootWindowEventFilter(tooltip_controller_.get());
 
   drag_drop_controller_.reset(new internal::DragDropController);
   power_button_controller_.reset(new PowerButtonController);
   video_detector_.reset(new VideoDetector);
   window_cycle_controller_.reset(new WindowCycleController);
+  monitor_controller_.reset(new internal::MonitorController);
 }
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return GetRootWindow()->GetChildById(container_id);
 }
@@ skipping 72 matching lines @@
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 int Shell::GetGridSize() const {
   return workspace_controller_->workspace_manager()->grid_size();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Shell, aura::MonitorObserver implementation:
-
-void Shell::OnMonitorBoundsChanged(const aura::Monitor* monitor) {
-  if (aura::RootWindow::use_fullscreen_host_window())
-    root_window_->SetHostSize(monitor->size());
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 void Shell::InitLayoutManagers() {
   DCHECK(root_window_layout_);
   DCHECK(status_widget_);
 
   internal::ShelfLayoutManager* shelf_layout_manager =
       new internal::ShelfLayoutManager(launcher_->widget(), status_widget_);
   GetContainer(internal::kShellWindowId_LauncherContainer)->
       SetLayoutManager(shelf_layout_manager);
@@ skipping 17 matching lines @@
   // Create the desktop background image.
   desktop_background_controller_->SetDefaultDesktopBackgroundImage();
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash