Initial cut of ash/wm/common classes for mus

mash/wm/root_window_controller.cc

Index: mash/wm/root_window_controller.cc
diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
index 5a07a2684e60ac29220db7215d31c3c5be14e5e3..45322adde91519b08bbcbd9622dbac5c6ccb2126 100644
--- a/mash/wm/root_window_controller.cc
+++ b/mash/wm/root_window_controller.cc
@@ -22,6 +22,7 @@
 #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 {
@@ -45,7 +46,7 @@ RootWindowController* RootWindowController::CreateFromDisplay(
     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,
@@ -195,7 +196,7 @@ void RootWindowController::CreateContainers() {
                   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);