Fix namespace for src/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>
@@ skipping 12 matching lines @@
 class Rect;
 class Size;
 }   // namespace gfx
 
 namespace display {
 namespace win {
 
 class DisplayInfo;
 class ScreenWinDisplay;
 
-class DISPLAY_EXPORT ScreenWin : public display::Screen {
+class DISPLAY_EXPORT ScreenWin : public Screen {
  public:
   ScreenWin();
   ~ScreenWin() override;
 
   // Converts a screen physical point to a screen DIP point.
   // The DPI scale is performed relative to the display containing the physical
   // point.
   static gfx::Point ScreenToDIPPoint(const gfx::Point& pixel_point);
 
   // Converts a screen DIP point to a screen physical point.
@@ skipping 58 matching lines @@
   // Returns |hwnd|'s scale factor.
   static float GetScaleFactorForHWND(HWND hwnd);
 
   // Returns the HWND associated with the NativeView.
   virtual HWND GetHWNDFromNativeView(gfx::NativeView window) const;
 
   // Returns the NativeView associated with the HWND.
   virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
 
  protected:
-  // display::Screen:
+  // Screen:
   gfx::Point GetCursorScreenPoint() override;
   bool IsWindowUnderCursor(gfx::NativeWindow window) override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
   int GetNumDisplays() const override;
-  const std::vector<display::Display>& GetAllDisplays() const override;
-  display::Display GetDisplayNearestWindow(
-      gfx::NativeView window) const override;
-  display::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const override;
-  display::Display GetDisplayMatching(
-      const gfx::Rect& match_rect) const override;
-  display::Display GetPrimaryDisplay() const override;
-  void AddObserver(display::DisplayObserver* observer) override;
-  void RemoveObserver(display::DisplayObserver* observer) override;
+  const std::vector<Display>& GetAllDisplays() const override;
+  Display GetDisplayNearestWindow(gfx::NativeView window) const override;
+  Display GetDisplayNearestPoint(const gfx::Point& point) const override;
+  Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
+  Display GetPrimaryDisplay() const override;
+  void AddObserver(DisplayObserver* observer) override;
+  void RemoveObserver(DisplayObserver* observer) override;
   gfx::Rect ScreenToDIPRectInWindow(
       gfx::NativeView view, const gfx::Rect& screen_rect) const override;
   gfx::Rect DIPToScreenRectInWindow(
       gfx::NativeView view, const gfx::Rect& dip_rect) const override;
 
   void UpdateFromDisplayInfos(const std::vector<DisplayInfo>& display_infos);
 
   // Virtual to support mocking by unit tests.
   virtual void Initialize();
   virtual MONITORINFOEX MonitorInfoFromScreenPoint(
@@ skipping 41 matching lines @@
   void RecordDisplayScaleFactors() const;
 
   // Helper implementing the DisplayObserver handling.
   DisplayChangeNotifier change_notifier_;
 
   std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 
   // Current list of ScreenWinDisplays.
   std::vector<ScreenWinDisplay> screen_win_displays_;
 
-  // The display::Displays corresponding to |screen_win_displays_| for
-  // GetAllDisplays(). This must be updated anytime |screen_win_displays_| is
-  // updated.
-  std::vector<display::Display> displays_;
+  // The Displays corresponding to |screen_win_displays_| for GetAllDisplays().
+  // This must be updated anytime |screen_win_displays_| is updated.
+  std::vector<Display> displays_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenWin);
 };
 
 }  // namespace win
 }  // namespace display
 
 #endif  // UI_DISPLAY_WIN_SCREEN_WIN_H_