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

ui/display/win/dpi.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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.
 
-#ifndef UI_GFX_DPI_WIN_H_
-#define UI_GFX_DPI_WIN_H_
+#ifndef UI_DISPLAY_WIN_DPI_H_
+#define UI_DISPLAY_WIN_DPI_H_
 
+#include "ui/display/display_export.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/gfx_export.h"
 
-namespace gfx {
+namespace display {
+namespace win {
 
 // Sets the device scale factor that will be used unless overridden on the
 // command line by --force-device-scale-factor.  If this is not called, and that
 // flag is not used, the scale factor used by the DIP conversion functions below
 // will be that returned by GetDPIScale().
-GFX_EXPORT void SetDefaultDeviceScaleFactor(float scale);
+DISPLAY_EXPORT void SetDefaultDeviceScaleFactor(float scale);
 
-GFX_EXPORT Size GetDPI();
+DISPLAY_EXPORT gfx::Size GetDPI();
 
 // Gets the scale factor of the display. For example, if the display DPI is
 // 96 then the scale factor is 1.0.  This clamps scale factors <= 1.25 to 1.0 to
 // maintain previous (non-DPI-aware) behavior where only the font size was
 // boosted.
-GFX_EXPORT float GetDPIScale();
-
-namespace win {
+DISPLAY_EXPORT float GetDPIScale();
 
 // Win32's GetSystemMetrics uses pixel measures. This function calls
 // GetSystemMetrics for the given |metric|, then converts the result to DIP.
-GFX_EXPORT int GetSystemMetricsInDIP(int metric);
+DISPLAY_EXPORT int GetSystemMetricsInDIP(int metric);
 
 }  // namespace win
-}  // namespace gfx
+}  // namespace display
 
-#endif  // UI_GFX_DPI_WIN_H_
+#endif  // UI_DISPLAY_WIN_DPI_H_