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

chrome/browser/ui/views/ash/window_positioner.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 "chrome/browser/ui/views/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 
 WindowPositioner::WindowPositioner()
     : pop_position_offset_increment_x(0),
       pop_position_offset_increment_y(0),
       popup_position_offset_from_screen_corner_x(0),
       popup_position_offset_from_screen_corner_y(0),
       last_popup_position_x_(0),
       last_popup_position_y_(0) {
 }
@@ skipping 17 matching lines @@
     last_popup_position_x_ = popup_position_offset_from_screen_corner_x;
     last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
   }
   pop_position_offset_increment_x = grid;
   pop_position_offset_increment_y = grid;
   // We handle the Multi monitor support by retrieving the active window's
   // work area.
   aura::Window* window = ash::wm::GetActiveWindow();
   const gfx::Rect work_area = window && window->IsVisible() ?
       gfx::Screen::GetMonitorWorkAreaNearestWindow(window) :
-      gfx::Screen::GetPrimaryMonitorWorkArea();
+      gfx::Screen::GetPrimaryMonitor()->GetWorkArea();
   // Only try to reposition the popup when it is not spanning the entire
   // screen.
   if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=
       work_area.width()) ||
       (old_pos.height() + popup_position_offset_from_screen_corner_y >=
        work_area.height()))
     return old_pos;
   const gfx::Rect result = SmartPopupPosition(old_pos, work_area);
   if (!result.IsEmpty())
     return result;
@@ skipping 90 matching lines @@
             break;
           }
         }
         if (i >= regions.size())
           return gfx::Rect(x + work_area.x(), y + work_area.y(), w, h);
       }
     }
   }
   return gfx::Rect(0, 0, 0, 0);
 }