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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 2780943002: Enables ScreenPinningController for mash/mus (Closed)
Patch Set: local Created 3 years, 9 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/bridge/wm_shell_mus.cc ('k') | ash/wm/screen_pinning_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 12e0012a1c74ddd9ad18c47b3b9a106b0dce969f..56726fa8c89c5f08b441a7dbbd321003b9a2a916 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -978,8 +978,7 @@ void Shell::Init(const ShellInitParams& init_params) {
}
sticky_keys_controller_.reset(new StickyKeysController);
- if (!is_mash)
- screen_pinning_controller_ = base::MakeUnique<ScreenPinningController>();
+ screen_pinning_controller_ = base::MakeUnique<ScreenPinningController>();
lock_state_controller_ =
base::MakeUnique<LockStateController>(shutdown_controller_.get());
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/wm/screen_pinning_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698