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

Unified Diff: ash/wm/ash_activation_controller.cc

Issue 14584004: Remove ash-disable-launcher-per-display flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 | « ash/shell.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_activation_controller.cc
diff --git a/ash/wm/ash_activation_controller.cc b/ash/wm/ash_activation_controller.cc
index f8c338a17815ea4e36514bac595be0ac2fd4207a..2c0237494e61eef948ec29c5f6f28300816dccc2 100644
--- a/ash/wm/ash_activation_controller.cc
+++ b/ash/wm/ash_activation_controller.cc
@@ -96,9 +96,7 @@ aura::Window* AshActivationController::PrepareToActivateLauncher() {
if (!Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled())
return NULL;
ShelfWidget* shelf = GetRootWindowController(
- Shell::IsLauncherPerDisplayEnabled() ?
- Shell::GetActiveRootWindow() :
- Shell::GetPrimaryRootWindow())->shelf();
+ Shell::GetActiveRootWindow())->shelf();
// Launcher's window may be already destroyed in shutting down process.
if (!shelf)
return NULL;
« no previous file with comments | « ash/shell.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698