Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

chrome/browser/ui/window_sizer_common_unittest.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WINDOW_SIZER_COMMON_UNITTEST_H_
 #define CHROME_BROWSER_UI_WINDOW_SIZER_COMMON_UNITTEST_H_
 #pragma once
 
 // Some standard monitor sizes (no task bar).
 static const gfx::Rect tentwentyfour(0, 0, 1024, 768);
@@ skipping 29 matching lines @@
 // Testing implementation of WindowSizer::MonitorInfoProvider that we can use
 // to fake various monitor layouts and sizes.
 class TestMonitorInfoProvider : public MonitorInfoProvider {
  public:
   TestMonitorInfoProvider();
   virtual ~TestMonitorInfoProvider();
 
   void AddMonitor(const gfx::Rect& bounds, const gfx::Rect& work_area);
 
   // Overridden from WindowSizer::MonitorInfoProvider:
-  virtual gfx::Rect GetPrimaryMonitorWorkArea() const OVERRIDE;
+  virtual gfx::Rect GetPrimaryDisplayWorkArea() const OVERRIDE;
 
-  virtual gfx::Rect GetPrimaryMonitorBounds() const OVERRIDE;
+  virtual gfx::Rect GetPrimaryDisplayBounds() const OVERRIDE;
 
   virtual gfx::Rect GetMonitorWorkAreaMatching(
       const gfx::Rect& match_rect) const OVERRIDE;
 
  private:
   size_t GetMonitorIndexMatchingBounds(const gfx::Rect& match_rect) const;
 
   std::vector<gfx::Rect> monitor_bounds_;
   std::vector<gfx::Rect> work_areas_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMonitorInfoProvider);
 };
 
 TestMonitorInfoProvider::TestMonitorInfoProvider() {}
 TestMonitorInfoProvider::~TestMonitorInfoProvider() {}
 
 void TestMonitorInfoProvider::AddMonitor(const gfx::Rect& bounds,
                                          const gfx::Rect& work_area) {
   DCHECK(bounds.Contains(work_area));
   monitor_bounds_.push_back(bounds);
   work_areas_.push_back(work_area);
 }
 
 // Overridden from WindowSizer::MonitorInfoProvider:
-gfx::Rect TestMonitorInfoProvider::GetPrimaryMonitorWorkArea() const {
+gfx::Rect TestMonitorInfoProvider::GetPrimaryDisplayWorkArea() const {
   return work_areas_[0];
 }
 
-gfx::Rect TestMonitorInfoProvider::GetPrimaryMonitorBounds() const {
+gfx::Rect TestMonitorInfoProvider::GetPrimaryDisplayBounds() const {
   return monitor_bounds_[0];
 }
 
 gfx::Rect TestMonitorInfoProvider::GetMonitorWorkAreaMatching(
     const gfx::Rect& match_rect) const {
   return work_areas_[GetMonitorIndexMatchingBounds(match_rect)];
 }
 
 size_t TestMonitorInfoProvider::GetMonitorIndexMatchingBounds(
     const gfx::Rect& match_rect) const {
@@ skipping 94 matching lines @@
   if (source == PERSISTED)
     sp->SetPersistentState(state, work_area, true);
   else if (source == LAST_ACTIVE)
     sp->SetLastActiveState(state, true);
 
   WindowSizer sizer(sp, mip, browser);
   sizer.DetermineWindowBounds(passed_in, out_bounds);
 }
 
 #endif  // CHROME_BROWSER_UI_WINDOW_SIZER_COMMON_UNITTEST_H_