Move ScreenWin to ui/display

ui/display/win/screen_win.h

Index: ui/display/win/screen_win.h
diff --git a/ui/gfx/screen_win.h b/ui/display/win/screen_win.h
similarity index 66%
rename from ui/gfx/screen_win.h
rename to ui/display/win/screen_win.h
index 2849e6623de312f412e32cc5a544a69080a9717b..d08f66416234daf75e2c5dbeb84bbdd7a4c62182 100644
--- a/ui/gfx/screen_win.h
+++ b/ui/display/win/screen_win.h
@@ -2,43 +2,42 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_SCREEN_WIN_H_
-#define UI_GFX_SCREEN_WIN_H_
+#ifndef UI_DISPLAY_WIN_SCREEN_WIN_H_
+#define UI_DISPLAY_WIN_SCREEN_WIN_H_
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/macros.h"
+#include "ui/display/display_export.h"
 #include "ui/gfx/display_change_notifier.h"
-#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/win/singleton_hwnd_observer.h"
 
 namespace gfx {
-
 class Display;
 class Point;
 class Rect;
+}   // namespace gfx
 
+namespace display {
 namespace win {
 
 class DisplayInfo;
 class ScreenWinDisplay;
 
-}  // namespace win
-
-class GFX_EXPORT ScreenWin : public Screen {
+class DISPLAY_EXPORT ScreenWin : public gfx::Screen {
  public:
   ScreenWin();
   ~ScreenWin() override;
 
   // Returns the HWND associated with the NativeView.
-  virtual HWND GetHWNDFromNativeView(NativeView window) const;
+  virtual HWND GetHWNDFromNativeView(gfx::NativeView window) const;
 
   // Returns the NativeView associated with the HWND.
-  virtual NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
+  virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
 
  protected:
   // gfx::Screen:
@@ -51,11 +50,10 @@ class GFX_EXPORT ScreenWin : public Screen {
   gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
   gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
   gfx::Display GetPrimaryDisplay() const override;
-  void AddObserver(DisplayObserver* observer) override;
-  void RemoveObserver(DisplayObserver* observer) override;
+  void AddObserver(gfx::DisplayObserver* observer) override;
+  void RemoveObserver(gfx::DisplayObserver* observer) override;
 
-  void UpdateFromDisplayInfos(
-      const std::vector<gfx::win::DisplayInfo>& display_infos);
+  void UpdateFromDisplayInfos(const std::vector<DisplayInfo>& display_infos);
 
   // Virtual to support mocking by unit tests.
   virtual void Initialize();
@@ -71,33 +69,33 @@ class GFX_EXPORT ScreenWin : public Screen {
   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
 
   // Returns the ScreenWinDisplay closest to or enclosing |hwnd|.
-  gfx::win::ScreenWinDisplay GetScreenWinDisplayNearestHWND(HWND hwnd) const;
+  ScreenWinDisplay GetScreenWinDisplayNearestHWND(HWND hwnd) const;
 
   // Returns the ScreenWinDisplay closest to or enclosing |screen_rect|.
-  gfx::win::ScreenWinDisplay GetScreenWinDisplayNearestScreenRect(
-      const Rect& screen_rect) const;
+  ScreenWinDisplay GetScreenWinDisplayNearestScreenRect(
+      const gfx::Rect& screen_rect) const;
 
   // Returns the ScreenWinDisplay closest to or enclosing |screen_point|.
-  gfx::win::ScreenWinDisplay GetScreenWinDisplayNearestScreenPoint(
-      const Point& screen_point) const;
+  ScreenWinDisplay GetScreenWinDisplayNearestScreenPoint(
+      const gfx::Point& screen_point) const;
 
   // Returns the ScreenWinDisplay corresponding to the primary monitor.
-  gfx::win::ScreenWinDisplay GetPrimaryScreenWinDisplay() const;
+  ScreenWinDisplay GetPrimaryScreenWinDisplay() const;
 
-  gfx::win::ScreenWinDisplay GetScreenWinDisplay(
-      const MONITORINFOEX& monitor_info) const;
+  ScreenWinDisplay GetScreenWinDisplay(const MONITORINFOEX& monitor_info) const;
 
   // Helper implementing the DisplayObserver handling.
   gfx::DisplayChangeNotifier change_notifier_;
 
-  scoped_ptr<SingletonHwndObserver> singleton_hwnd_observer_;
+  scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 
   // Current list of ScreenWinDisplays.
-  std::vector<gfx::win::ScreenWinDisplay> screen_win_displays_;
+  std::vector<ScreenWinDisplay> screen_win_displays_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenWin);
 };
 
-}  // namespace gfx
+}  // namespace win
+}  // namespace display
 
-#endif  // UI_GFX_SCREEN_WIN_H_
+#endif  // UI_DISPLAY_WIN_SCREEN_WIN_H_