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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2906873003: chromeos: turn on simplified display management for mash (Closed)
Patch Set: bug refs Created 3 years, 6 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 | « ash/mus/window_manager.cc ('k') | ash/rotator/screen_rotation_animator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index aba1d54f97cd837b0bf7775482bc9b9c7621e1e7..b2148bf3df253b8eba640807ed7b06fb77954df3 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -10,6 +10,7 @@
#include "ash/mus/network_connect_delegate_mus.h"
#include "ash/mus/window_manager.h"
#include "ash/public/cpp/config.h"
+#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/system/power/power_status.h"
#include "base/bind.h"
@@ -149,7 +150,8 @@ void WindowManagerApplication::OnStart() {
base::MakeUnique<aura::WindowTreeClient>(
context()->connector(), window_manager_.get(), window_manager_.get());
const bool automatically_create_display_roots =
- window_manager_->config() == Config::MASH;
+ !Shell::ShouldEnableSimplifiedDisplayManagement(
+ window_manager_->config());
window_tree_client->ConnectAsWindowManager(
automatically_create_display_roots);
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/rotator/screen_rotation_animator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698