Move Screen, its impls, DisplayObserver and DisplayChangeNotifier to ui/display

ui/display/win/screen_win.h

 // 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.
 
 #ifndef UI_DISPLAY_WIN_SCREEN_WIN_H_
 #define UI_DISPLAY_WIN_SCREEN_WIN_H_
 
 #include <windows.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
+#include "ui/display/display_change_notifier.h"
 #include "ui/display/display_export.h"
 #include "ui/display/screen.h"
-#include "ui/gfx/display_change_notifier.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/win/singleton_hwnd_observer.h"
 
 namespace gfx {
 class Display;
 class Point;
 class Rect;
 class Size;
 }   // namespace gfx
 
@@ skipping 110 matching lines @@
   // Returns the ScreenWinDisplay closest to or enclosing |screen_point|.
   ScreenWinDisplay GetScreenWinDisplayNearestScreenPoint(
       const gfx::Point& screen_point) const;
 
   // Returns the ScreenWinDisplay corresponding to the primary monitor.
   ScreenWinDisplay GetPrimaryScreenWinDisplay() const;
 
   ScreenWinDisplay GetScreenWinDisplay(const MONITORINFOEX& monitor_info) const;
 
   // Helper implementing the DisplayObserver handling.
-  gfx::DisplayChangeNotifier change_notifier_;
+  DisplayChangeNotifier change_notifier_;
 
   std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 
   // Current list of ScreenWinDisplays.
   std::vector<ScreenWinDisplay> screen_win_displays_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenWin);
 };
 
 }  // namespace win
 }  // namespace display
 
 #endif  // UI_DISPLAY_WIN_SCREEN_WIN_H_