Move Windows DPI Code from ui/gfx to ui/display

content/browser/renderer_host/render_view_host_impl.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_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 73 matching lines @@
 #include "ui/base/touch/touch_enabled.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "url/url_constants.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
+#include "ui/display/win/dpi.h"
 #include "ui/gfx/platform_font_win.h"
-#include "ui/gfx/win/dpi.h"
 #endif
 
 using base::TimeDelta;
 using blink::WebConsoleMessage;
 using blink::WebDragOperation;
 using blink::WebDragOperationNone;
 using blink::WebDragOperationsMask;
 using blink::WebInputEvent;
 using blink::WebMediaPlayerAction;
 using blink::WebPluginAction;
@@ skipping 41 matching lines @@
 
   prefs->status_font_family_name = metrics.lfStatusFont.lfFaceName;
   prefs->status_font_height = gfx::PlatformFontWin::GetFontSize(
       metrics.lfStatusFont);
 
   prefs->message_font_family_name = metrics.lfMessageFont.lfFaceName;
   prefs->message_font_height = gfx::PlatformFontWin::GetFontSize(
       metrics.lfMessageFont);
 
   prefs->vertical_scroll_bar_width_in_dips =
-      gfx::win::GetSystemMetricsInDIP(SM_CXVSCROLL);
+      display::win::GetSystemMetricsInDIP(SM_CXVSCROLL);
   prefs->horizontal_scroll_bar_height_in_dips =
-      gfx::win::GetSystemMetricsInDIP(SM_CYHSCROLL);
+      display::win::GetSystemMetricsInDIP(SM_CYHSCROLL);
   prefs->arrow_bitmap_height_vertical_scroll_bar_in_dips =
-      gfx::win::GetSystemMetricsInDIP(SM_CYVSCROLL);
+      display::win::GetSystemMetricsInDIP(SM_CYVSCROLL);
   prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
-      gfx::win::GetSystemMetricsInDIP(SM_CXHSCROLL);
+      display::win::GetSystemMetricsInDIP(SM_CXHSCROLL);
 }
 #endif
 
 }  // namespace
 
 // static
 const int64_t RenderViewHostImpl::kUnloadTimeoutMS = 1000;
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHost, public:
@@ skipping 1175 matching lines @@
   } else {
     render_view_ready_on_process_launch_ = true;
   }
 }
 
 void RenderViewHostImpl::RenderViewReady() {
   delegate_->RenderViewReady(this);
 }
 
 }  // namespace content