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

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/logging.h"
@@ skipping 18 matching lines @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/gestures/gesture_recognizer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 
 using content::BrowserThread;
 using content::RenderWidgetHost;
 using content::RenderWidgetHostImpl;
 using content::RenderWidgetHostView;
 using WebKit::WebTouchEvent;
 
 namespace {
@@ skipping 1233 matching lines @@
 
 // static
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
-  const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
+  const gfx::Size size = gfx::Screen::GetPrimaryMonitor()->GetBounds().size();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
   // TODO(fsamuel): This is a temporary hack until Monitor code is complete.
   int default_dpi = 96;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDefaultDeviceScaleFactor)) {
     int default_device_scale_factor;
     base::StringToInt(command_line.GetSwitchValueASCII(
                           switches::kDefaultDeviceScaleFactor),
                       &default_device_scale_factor);
     default_dpi = default_device_scale_factor * 160;
   }
   results->verticalDPI = default_dpi;
   results->horizontalDPI = default_dpi;
 }