Fix namespace and primary display in ScreenBase.

ui/display/screen_base.h

Index: ui/display/screen_base.h
diff --git a/ui/display/screen_base.h b/ui/display/screen_base.h
index e0c5b1c2ecf96b63c800be5a1e638b79dcaad57e..3b206af14cbeaebd88e1cba8807df9ac54931e9a 100644
--- a/ui/display/screen_base.h
+++ b/ui/display/screen_base.h
@@ -5,6 +5,8 @@
 #ifndef UI_DISPLAY_SCREEN_BASE_H_
 #define UI_DISPLAY_SCREEN_BASE_H_
 
+#include <vector>
+
 #include "ui/display/display.h"
 #include "ui/display/display_export.h"
 #include "ui/display/display_list.h"
@@ -13,36 +15,33 @@
 namespace display {
 
 // Simple screen implementation with a display list.
-class DISPLAY_EXPORT ScreenBase : public display::Screen {
+class DISPLAY_EXPORT ScreenBase : public Screen {
  public:
   ScreenBase();
   ~ScreenBase() override;
 
-  display::DisplayList* display_list() { return &display_list_; };
+  DisplayList* display_list() { return &display_list_; }
 
  protected:
   // Invoked when a display changed in some way, including being added.
   // If |is_primary| is true, |changed_display| is the primary display.
-  void ProcessDisplayChanged(const display::Display& changed_display,
-                             bool is_primary);
+  void ProcessDisplayChanged(const Display& changed_display, bool is_primary);
 
  private:
-  // display::Screen:
+  // Screen:
   gfx::Point GetCursorScreenPoint() override;
   bool IsWindowUnderCursor(gfx::NativeWindow window) override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
-  display::Display GetPrimaryDisplay() const override;
-  display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
-  display::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const override;
+  Display GetPrimaryDisplay() const override;
+  Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  Display GetDisplayNearestPoint(const gfx::Point& point) const override;
   int GetNumDisplays() const override;
-  std::vector<display::Display> GetAllDisplays() const override;
-  display::Display GetDisplayMatching(
-      const gfx::Rect& match_rect) const override;
-  void AddObserver(display::DisplayObserver* observer) override;
-  void RemoveObserver(display::DisplayObserver* observer) override;
+  std::vector<Display> GetAllDisplays() const override;
+  Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
+  void AddObserver(DisplayObserver* observer) override;
+  void RemoveObserver(DisplayObserver* observer) override;
 
-  display::DisplayList display_list_;
+  DisplayList display_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenBase);
 };