| Index: mash/wm/root_window_controller.cc
|
| diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
|
| index f2dc0734fead9a65aa678e835e087d857b1f27bb..8f0a9d29e95f9f2043076b77440b09d66a153199 100644
|
| --- a/mash/wm/root_window_controller.cc
|
| +++ b/mash/wm/root_window_controller.cc
|
| @@ -23,6 +23,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 {
|
| @@ -46,7 +47,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,
|
| @@ -203,7 +204,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);
|
|
|