Initial cut of ash/wm/common classes for mus

mash/wm/root_window_controller.cc

 // 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.
 
 #include "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/event_matcher_util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/background_layout.h"
 #include "mash/wm/fill_layout.h"
 #include "mash/wm/screenlock_layout.h"
 #include "mash/wm/shadow_controller.h"
 #include "mash/wm/shelf_layout.h"
 #include "mash/wm/window_layout.h"
 #include "mash/wm/window_manager.h"
 #include "mash/wm/window_manager_application.h"
 #include "services/shell/public/cpp/connector.h"
+#include "ui/mojo/display/display_type_converters.h"
 
 namespace mash {
 namespace wm {
 namespace {
 
 const uint32_t kWindowSwitchAccelerator = 1;
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 int ContainerToLocalId(mojom::Container container) {
   return static_cast<int>(container);
 }
 
 }  // namespace
 
 // static
 RootWindowController* RootWindowController::CreateFromDisplay(
     WindowManagerApplication* app,
     mus::mojom::DisplayPtr display,
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
   RootWindowController* controller = new RootWindowController(app);
-  controller->display_ = std::move(display);
+  controller->display_ = display.To<gfx::Display>();
   mus::WindowTreeConnection::CreateForWindowManager(
       controller, std::move(client_request),
       mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED,
       controller->window_manager_.get());
   return controller;
 }
 
 void RootWindowController::Destroy() {
   // See class description for details on lifetime.
   if (root_) {
@@ skipping 129 matching lines @@
 void RootWindowController::CreateContainers() {
   CreateContainer(mojom::Container::ALL_USER_BACKGROUND,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::USER_WORKSPACE, mojom::Container::ROOT);
   CreateContainer(mojom::Container::USER_BACKGROUND,
                   mojom::Container::USER_WORKSPACE);
   CreateContainer(mojom::Container::USER_PRIVATE,
                   mojom::Container::USER_WORKSPACE);
   CreateContainer(mojom::Container::USER_WINDOWS,
                   mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_STICKY_WINDOWS,
+  CreateContainer(mojom::Container::USER_ALWAYS_ON_TOP_WINDOWS,
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_PRESENTATION_WINDOWS,
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_SHELF, mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::LOGIN_WINDOWS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::LOGIN_APP, mojom::Container::LOGIN_WINDOWS);
   CreateContainer(mojom::Container::LOGIN_SHELF,
                   mojom::Container::LOGIN_WINDOWS);
   CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash