Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1364)

Unified Diff: mash/wm/root_window_controller.cc

Issue 1954933002: Initial cut of ash/wm/common classes for mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/root_window_controller.h ('k') | mash/wm/window_layout.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « mash/wm/root_window_controller.h ('k') | mash/wm/window_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698