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

chrome/browser/ui/window_sizer_ash.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/window_sizer.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
@@ skipping 82 matching lines @@
     // If both fail we will continue the default path.
   }
 
   return false;
 }
 
 void WindowSizer::GetDefaultWindowBounds(gfx::Rect* default_bounds) const {
   DCHECK(default_bounds);
   DCHECK(monitor_info_provider_.get());
 
-  gfx::Rect work_area = monitor_info_provider_->GetPrimaryMonitorWorkArea();
+  gfx::Rect work_area = monitor_info_provider_->GetPrimaryDisplayWorkArea();
 
   DCHECK_EQ(kDesktopBorderSize, ash::Shell::GetInstance()->GetGridSize());
 
   // There should be a 'desktop' border around the window at the left and right
   // side.
   int default_width = work_area.width() - 2 * kDesktopBorderSize;
   // There should also be a 'desktop' border around the window at the top.
   // Since the workspace excludes the tray area we only need one border size.
   int default_height = work_area.height() - kDesktopBorderSize;
   // We align the size to the grid size to avoid any surprise when the
   // monitor height isn't divide-able by our alignment factor.
   default_width -= default_width % kDesktopBorderSize;
   default_height -= default_height % kDesktopBorderSize;
   int offset_x = kDesktopBorderSize;
   int maximum_window_width = 1280;
   if (default_width > maximum_window_width) {
     // The window should get centered on the screen and not follow the grid.
     offset_x = (work_area.width() - maximum_window_width) / 2;
     // Never make a window wider then 1280.
     default_width = maximum_window_width;
   }
   default_bounds->SetRect(work_area.x() + offset_x,
                           work_area.y() + kDesktopBorderSize,
                           default_width,
                           default_height);
 }