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

Unified Diff: ui/views/mus/aura_init.cc

Issue 2511233002: Add the beginning of a simple window manager that we'll support on Windows. (Closed)
Patch Set: . Created 4 years 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 | « ui/views/mus/aura_init.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/aura_init.cc
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index 38d7ae84a5fc3f3f703ffa4d110e05ac8c94acf6..ec928419f61886ea6228f39d6150bbedeccd1c01 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -55,9 +55,10 @@ AuraInit::AuraInit(service_manager::Connector* connector,
Mode mode)
: resource_file_(resource_file),
resource_file_200_(resource_file_200),
- env_(aura::Env::CreateInstance(mode == Mode::AURA_MUS
- ? aura::Env::Mode::MUS
- : aura::Env::Mode::LOCAL)),
+ env_(aura::Env::CreateInstance(
+ (mode == Mode::AURA_MUS || mode == Mode::AURA_MUS_WINDOW_MANAGER)
+ ? aura::Env::Mode::MUS
+ : aura::Env::Mode::LOCAL)),
views_delegate_(new MusViewsDelegate) {
if (mode == Mode::AURA_MUS) {
mus_client_ =
« no previous file with comments | « ui/views/mus/aura_init.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698