Get the default device scale factor from monitor

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"
 #include "base/memory/weak_ptr.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/image_transport_client.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/content_switches.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/aura/env.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ skipping 87 matching lines @@
 }
 
 void GetScreenInfoForWindow(WebKit::WebScreenInfo* results,
                             aura::Window* window) {
   const gfx::Monitor monitor = window ?
       gfx::Screen::GetMonitorNearestWindow(window) :
       gfx::Screen::GetPrimaryMonitor();
   const gfx::Size size = monitor.size();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
-  // TODO(derat): Don't hardcode this?
+  // TODO(derat|oshima): Don't hardcode this. Get this from monitor object.
   results->depth = 24;
   results->depthPerComponent = 8;
   int default_dpi = monitor.device_scale_factor() * 160;
-  // TODO(fsamuel): This is a temporary hack until Monitor code is complete.
-  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;
 }
 
 }  // namespace
 
 // We have to implement the WindowObserver interface on a separate object
 // because clang doesn't like implementing multiple interfaces that have
 // methods with the same name. This object is owned by the
 // RenderWidgetHostViewAura.
@@ skipping 1174 matching lines @@
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }