Refactor screen/monitor so that gfx::Screen returns monitor object.

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_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 97 matching lines @@
 
 void WorkspaceManager::UpdateShelfVisibility() {
   shelf_->UpdateVisibilityState();
 }
 
 WorkspaceManager::WindowState WorkspaceManager::GetWindowState() {
   if (!shelf_ || !active_workspace_)
     return WINDOW_STATE_DEFAULT;
 
   // TODO: this code needs to be made multi-monitor aware.
-  gfx::Rect bounds(gfx::Screen::GetMonitorAreaNearestWindow(contents_view_));
+  gfx::Rect bounds(
+      gfx::Screen::GetMonitorNearestWindow(contents_view_).bounds());
   bounds.set_height(bounds.height() - shelf_->shelf_height());
   const aura::Window::Windows& windows(contents_view_->children());
   bool window_overlaps_launcher = false;
   for (aura::Window::Windows::const_iterator i = windows.begin();
        i != windows.end(); ++i) {
     ui::Layer* layer = (*i)->layer();
     if (!layer->GetTargetVisibility() || layer->GetTargetOpacity() == 0.0f)
       continue;
     if (wm::IsWindowMaximized(*i))
       return WINDOW_STATE_MAXIMIZED;
@@ skipping 175 matching lines @@
   return workspace;
 }
 
 void WorkspaceManager::CleanupWorkspace(Workspace* workspace) {
   if (workspace->type() != Workspace::TYPE_MANAGED && workspace->is_empty())
     delete workspace;
 }
 
 }  // namespace internal
 }  // namespace ash