Move DisplayList to display; add ScreenBase.

ui/views/mus/screen_mus.h

Index: ui/views/mus/screen_mus.h
diff --git a/ui/views/mus/screen_mus.h b/ui/views/mus/screen_mus.h
index 2e910e4c4a98e34eb5ccfd549a3f07ae8f97fb83..b86d5d4b16ba27a5e2043bef47d2bdce6d6253c8 100644
--- a/ui/views/mus/screen_mus.h
+++ b/ui/views/mus/screen_mus.h
@@ -5,15 +5,9 @@
 #ifndef UI_VIEWS_MUS_SCREEN_MUS_H_
 #define UI_VIEWS_MUS_SCREEN_MUS_H_
 
-#include <vector>
-
-#include "base/observer_list.h"
-#include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/display.mojom.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/views/mus/display_list.h"
+#include "ui/display/screen_base.h"
 #include "ui/views/mus/mus_export.h"
 
 namespace shell {
@@ -26,7 +20,7 @@ class ScreenMusDelegate;
 
 // Screen implementation backed by ui::mojom::DisplayManager.
 class VIEWS_MUS_EXPORT ScreenMus
-    : public display::Screen,
+    : public display::ScreenBase,
       public NON_EXPORTED_BASE(ui::mojom::DisplayManagerObserver) {
  public:
   // |delegate| can be nullptr.
@@ -36,25 +30,9 @@ class VIEWS_MUS_EXPORT ScreenMus
   void Init(shell::Connector* connector);
 
  private:
-  // Invoked when a display changed in some weay, including being added.
-  // If |is_primary| is true, |changed_display| is the primary display.
-  void ProcessDisplayChanged(const display::Display& changed_display,
-                             bool is_primary);
-
   // display::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;
-  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;
 
   // ui::mojom::DisplayManager:
   void OnDisplays(mojo::Array<ui::mojom::WsDisplayPtr> ws_displays) override;
@@ -66,7 +44,6 @@ class VIEWS_MUS_EXPORT ScreenMus
   ui::mojom::DisplayManagerPtr display_manager_;
   mojo::Binding<ui::mojom::DisplayManagerObserver>
       display_manager_observer_binding_;
-  DisplayList display_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenMus);
 };