MonitorManager to manage multiple monitors.

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"
@@ skipping 39 matching lines @@
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
+#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
@@ skipping 245 matching lines @@
       delegate_(delegate),
       audio_controller_(NULL),
       brightness_controller_(NULL),
       network_controller_(NULL),
       power_status_controller_(NULL),
       update_controller_(NULL),
       shelf_(NULL),
       desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
+  aura::Env::GetInstance()->SetMonitorManager(
+      aura::CreateSingleMonitorManager(root_window_.get()));
   gfx::Screen::SetInstance(screen_);
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 #endif
@@ skipping 264 matching lines @@
   frame_view->Init(widget);
   return frame_view;
 }
 
 void Shell::RotateFocus(Direction direction) {
   focus_cycler_->RotateFocus(
       direction == FORWARD ? internal::FocusCycler::FORWARD :
                              internal::FocusCycler::BACKWARD);
 }
 
-void Shell::SetScreenWorkAreaInsets(const gfx::Insets& insets) {
-  if (screen_->work_area_insets() == insets)
+void Shell::SetMonitorWorkAreaInsets(Window* contains,
+                                     const gfx::Insets& insets) {
+  aura::Monitor* monitor = aura::Env::GetInstance()->monitor_manager()->
+      GetMonitorNearestWindow(contains);
+  if (monitor->work_area_insets() == insets)
     return;
-  screen_->set_work_area_insets(insets);
+  monitor->set_work_area_insets(insets);
   FOR_EACH_OBSERVER(ShellObserver, observers_,
-                    OnScreenWorkAreaInsetsChanged());
+                    OnMonitorWorkAreaInsetsChanged());
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 28 matching lines @@
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash