Move DisplayList to display; add ScreenBase.

ui/display/display_list.h

 // Copyright 2016 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_VIEWS_MUS_DISPLAY_LIST_H_
-#define UI_VIEWS_MUS_DISPLAY_LIST_H_
+#ifndef UI_DISPLAY_DISPLAY_LIST_H_
+#define UI_DISPLAY_DISPLAY_LIST_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/observer_list.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "ui/display/display.h"
-#include "ui/views/mus/mus_export.h"
+#include "ui/display/display_export.h"
 
 namespace display {
+
 class Display;
 class DisplayObserver;
-}
-
-namespace views {
 
 // Maintains an ordered list of display::Displays as well as operations to add,
 // remove and update said list. Additionally maintains display::DisplayObservers
 // and updates them as appropriate.
-class VIEWS_MUS_EXPORT DisplayList {
+class DISPLAY_EXPORT DisplayList {
  public:
   using Displays = std::vector<display::Display>;
 
   enum class Type {
     PRIMARY,
     NOT_PRIMARY,
   };
 
   DisplayList();
   ~DisplayList();
@@ skipping 19 matching lines @@
   void RemoveDisplay(int64_t id);
 
  private:
   std::vector<display::Display> displays_;
   int primary_display_index_ = -1;
   base::ObserverList<display::DisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayList);
 };
 
-}  // namespace views
+}  // namespace display
 
-#endif  // UI_VIEWS_MUS_DISPLAY_LIST_H_
+#endif  // UI_DISPLAY_DISPLAY_LIST_H_