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

content/browser/renderer_host/render_widget_host_view_aura.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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 95 matching lines @@
     default:
       break;
   }
 #endif
   return true;
 }
 
 void GetScreenInfoForWindow(WebKit::WebScreenInfo* results,
                             aura::Window* window) {
   const gfx::Display display = window ?
-      gfx::Screen::GetMonitorNearestWindow(window) :
-      gfx::Screen::GetPrimaryMonitor();
+      gfx::Screen::GetDisplayNearestWindow(window) :
+      gfx::Screen::GetPrimaryDisplay();
   const gfx::Size size = display.size();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat|oshima): Don't hardcode this. Get this from display object.
   results->depth = 24;
   results->depthPerComponent = 8;
   int default_dpi = display.device_scale_factor() * 160;
   results->verticalDPI = default_dpi;
   results->horizontalDPI = default_dpi;
 }
@@ skipping 1393 matching lines @@
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }