Move DisplayList to display; add ScreenBase.

ash/mus/window_manager.cc

 // Copyright 2015 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.
 
 #include "ash/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 18 matching lines @@
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/mojo/event.mojom.h"
 #include "ui/views/mus/pointer_watcher_event_router.h"
 #include "ui/views/mus/screen_mus.h"
 
-namespace ash {
-namespace mus {
-
-void AssertTrue(bool success) {
-  DCHECK(success);
-}
+namespace {
 
 // TODO(jamescook): Port ash::sysui::AppListPresenterMus and eliminate this.
 class AppListPresenterStub : public app_list::AppListPresenter {
  public:
   AppListPresenterStub() {}
   ~AppListPresenterStub() override {}
 
   // app_list::AppListPresenter:
   void Show(int64_t display_id) override { NOTIMPLEMENTED(); }
   void Dismiss() override { NOTIMPLEMENTED(); }
   void ToggleAppList(int64_t display_id) override { NOTIMPLEMENTED(); }
   bool IsVisible() const override {
     NOTIMPLEMENTED();
     return false;
   }
   bool GetTargetVisibility() const override {
     NOTIMPLEMENTED();
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListPresenterStub);
 };
 
+}  // namespace
+
+namespace ash {
+namespace mus {
+
 WindowManager::WindowManager(shell::Connector* connector)
     : connector_(connector) {}
 
 WindowManager::~WindowManager() {
   Shutdown();
 }
 
 void WindowManager::Init(
     std::unique_ptr<ui::WindowTreeClient> window_tree_client) {
   DCHECK(!window_tree_client_);
@@ skipping 75 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void WindowManager::RemoveObserver(WindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 RootWindowController* WindowManager::CreateRootWindowController(
     ui::Window* window,
     const display::Display& display) {
-  // TODO(sky): there is timing issues with using ScreenMus.
+  // TODO(sky): There are timing issues with using ScreenMus.
   if (!screen_) {
     std::unique_ptr<views::ScreenMus> screen(new views::ScreenMus(nullptr));
     screen->Init(connector_);
     screen_ = std::move(screen);
   }
 
   std::unique_ptr<RootWindowController> root_window_controller_ptr(
       new RootWindowController(this, window, display));
   RootWindowController* root_window_controller =
       root_window_controller_ptr.get();
@@ skipping 85 matching lines @@
   // OnWmSetBounds() recommends doing. Remove that restriction, or fix this.
   WmWindowMus::Get(window)->SetBounds(*bounds);
   *bounds = window->bounds();
   return true;
 }
 
 bool WindowManager::OnWmSetProperty(
     ui::Window* window,
     const std::string& name,
     std::unique_ptr<std::vector<uint8_t>>* new_data) {
-  // TODO(sky): constrain this to set of keys we know about, and allowed
-  // values.
+  // TODO(sky): constrain this to set of keys we know about, and allowed values.
   return name == ui::mojom::WindowManager::kShowState_Property ||
          name == ui::mojom::WindowManager::kPreferredSize_Property ||
          name == ui::mojom::WindowManager::kResizeBehavior_Property ||
          name == ui::mojom::WindowManager::kWindowAppIcon_Property ||
          name == ui::mojom::WindowManager::kWindowTitle_Property;
 }
 
 ui::Window* WindowManager::OnWmCreateTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   return NewTopLevelWindow(properties);
@@ skipping 42 matching lines @@
                                                     const ui::Event& event) {
   auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id));
   if (iter == accelerator_handlers_.end())
     return ui::mojom::EventResult::HANDLED;
 
   return iter->second->OnAccelerator(id, event);
 }
 
 }  // namespace mus
 }  // namespace ash