Move ScreenWin to ui/display

ui/display/win/display_info.h

Index: ui/display/win/display_info.h
diff --git a/ui/gfx/win/display_info.h b/ui/display/win/display_info.h
similarity index 76%
rename from ui/gfx/win/display_info.h
rename to ui/display/win/display_info.h
index cd972dfcf78b2ae42743c55d0138be2f447b46a7..d9abdc3f2a7492b4a9028319e56188e9f0a9b73d 100644
--- a/ui/gfx/win/display_info.h
+++ b/ui/display/win/display_info.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_WIN_DISPLAY_INFO_H_
-#define UI_GFX_WIN_DISPLAY_INFO_H_
+#ifndef UI_DISPLAY_WIN_DISPLAY_INFO_H_
+#define UI_DISPLAY_WIN_DISPLAY_INFO_H_
 
 #include <windows.h>
 #include <stdint.h>
 
+#include "ui/display/display_export.h"
 #include "ui/gfx/display.h"
-#include "ui/gfx/gfx_export.h"
 
-namespace gfx {
+namespace display {
 namespace win {
 
-// Gathers the parameters necessary to create a gfx::win::ScreenWinDisplay.
-class GFX_EXPORT DisplayInfo final {
+// Gathers the parameters necessary to create a display::win::ScreenWinDisplay.
+class DISPLAY_EXPORT DisplayInfo final {
  public:
   DisplayInfo(const MONITORINFOEX& monitor_info, float device_scale_factor);
   DisplayInfo(const MONITORINFOEX& monitor_info,
@@ -39,6 +39,6 @@ class GFX_EXPORT DisplayInfo final {
 };
 
 }  // namespace win
-}  // namespace gfx
+}  // namespace display
 
-#endif  // UI_GFX_WIN_DISPLAY_INFO_H_
+#endif  // UI_DISPLAY_WIN_DISPLAY_INFO_H_