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

ash/wm/base_layout_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/base_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 93 matching lines @@
 }
 
 void BaseLayoutManager::SetChildBounds(aura::Window* child,
                                        const gfx::Rect& requested_bounds) {
   gfx::Rect child_bounds(requested_bounds);
   // Avoid a janky resize on startup by ensuring the initial bounds fill the
   // screen.
   if (wm::IsWindowMaximized(child))
     child_bounds = ScreenAsh::GetMaximizedWindowBounds(child);
   else if (wm::IsWindowFullscreen(child))
-    child_bounds = gfx::Screen::GetMonitorAreaNearestWindow(child);
+    child_bounds = gfx::Screen::GetMonitorNearestWindow(child).bounds();
   SetChildBoundsDirect(child, child_bounds);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, RootWindowObserver overrides:
 
 void BaseLayoutManager::OnRootWindowResized(const aura::RootWindow* root,
                                             const gfx::Size& old_size) {
   AdjustWindowSizesForScreenChange();
 }
@@ skipping 62 matching lines @@
       break;
     }
 
     case ui::SHOW_STATE_MAXIMIZED:
       SetRestoreBoundsIfNotSet(window);
       SetChildBoundsDirect(window, ScreenAsh::GetMaximizedWindowBounds(window));
       break;
 
     case ui::SHOW_STATE_FULLSCREEN:
       SetRestoreBoundsIfNotSet(window);
-      SetChildBoundsDirect(window,
-                           gfx::Screen::GetMonitorAreaNearestWindow(window));
+      SetChildBoundsDirect(
+          window, gfx::Screen::GetMonitorNearestWindow(window).bounds());
       break;
 
     default:
       break;
   }
 }
 
 void BaseLayoutManager::AdjustWindowSizesForScreenChange() {
   // If a user plugs an external monitor into a laptop running Aura the
   // monitor size will change.  Maximized windows need to resize to match.
   // We also do this when developers running Aura on a desktop manually resize
   // the host window.
   // We also need to do this when the work area insets changes.
   for (WindowSet::const_iterator it = windows_.begin();
        it != windows_.end();
        ++it) {
     aura::Window* window = *it;
     if (wm::IsWindowMaximized(window)) {
       SetChildBoundsDirect(window, ScreenAsh::GetMaximizedWindowBounds(window));
     } else if (wm::IsWindowFullscreen(window)) {
-      SetChildBoundsDirect(window,
-                           gfx::Screen::GetMonitorAreaNearestWindow(window));
+      SetChildBoundsDirect(
+          window, gfx::Screen::GetMonitorNearestWindow(window).bounds());
     } else {
       // The work area may be smaller than the full screen.
       gfx::Rect monitor_rect =
-          gfx::Screen::GetMonitorWorkAreaNearestWindow(window);
+          gfx::Screen::GetMonitorNearestWindow(window).work_area();
       // Put as much of the window as possible within the monitor area.
       window->SetBounds(window->bounds().AdjustToFit(monitor_rect));
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash