MonitorManager to manage multiple monitors.

ash/wm/workspace/workspace_manager.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/wm/workspace/workspace_manager.h"
 
 #include <algorithm>
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/managed_workspace.h"
 #include "ash/wm/workspace/maximized_workspace.h"
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "ui/aura/env.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/transform.h"
 
 namespace {
 
@@ skipping 117 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void WorkspaceManager::SetWorkspaceSize(const gfx::Size& workspace_size) {
   if (workspace_size == workspace_size_)
     return;
   workspace_size_ = workspace_size;
   SetWorkspaceBounds();
 }
 
-void WorkspaceManager::OnScreenWorkAreaInsetsChanged() {
+void WorkspaceManager::OnMonitorWorkAreaInsetsChanged() {
   SetWorkspaceBounds();
 }
 
 gfx::Rect WorkspaceManager::AlignBoundsToGrid(const gfx::Rect& bounds) {
   if (grid_size_ <= 1)
     return bounds;
   return AlignRectToGrid(bounds, grid_size_);
 }
 
 void WorkspaceManager::ShowStateChanged(aura::Window* window) {
@@ skipping 108 matching lines @@
   active_workspace_ = workspace;
   if (active_workspace_) {
     SetVisibilityOfWorkspaceWindows(active_workspace_,
                                     last_active ? ANIMATE : DONT_ANIMATE, true);
     UpdateShelfVisibility();
   }
 
   is_overview_ = false;
 }
 
-gfx::Rect WorkspaceManager::GetWorkAreaBounds() {
+gfx::Rect WorkspaceManager::GetWorkAreaBounds() const {
   gfx::Rect bounds(workspace_size_);
-  bounds.Inset(Shell::GetInstance()->screen()->work_area_insets());
+  const aura::MonitorManager* monitor_manager =
+      aura::Env::GetInstance()->monitor_manager();
+  const aura::Monitor* monitor =
+      monitor_manager->GetMonitorNearestWindow(contents_view_);
+  bounds.Inset(monitor->work_area_insets());
   return bounds;
 }
 
 // Returns the index of the workspace that contains the |window|.
 int WorkspaceManager::GetWorkspaceIndexContaining(aura::Window* window) const {
   for (Workspaces::const_iterator i = workspaces_.begin();
        i != workspaces_.end();
        ++i) {
     if ((*i)->Contains(window))
       return i - workspaces_.begin();
@@ skipping 55 matching lines @@
   if (type == Workspace::TYPE_MAXIMIZED)
     workspace = new MaximizedWorkspace(this);
   else
     workspace = new ManagedWorkspace(this);
   AddWorkspace(workspace);
   return workspace;
 }
 
 }  // namespace internal
 }  // namespace ash