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

Unified Diff: ash/accelerators/accelerator_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 | « no previous file | ash/ash_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index f7a9ecba6754a227faa73cdc8cf3f3154a554106..e2309fc8d8f1225acf4497af1c2c01d1464d687e 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -700,18 +700,14 @@ bool AcceleratorController::PerformAction(int action,
break;
case SHOW_SYSTEM_TRAY_BUBBLE: {
internal::RootWindowController* controller =
- Shell::IsLauncherPerDisplayEnabled() ?
- internal::RootWindowController::ForActiveRootWindow() :
- Shell::GetPrimaryRootWindowController();
+ internal::RootWindowController::ForActiveRootWindow();
if (!controller->GetSystemTray()->HasSystemBubble())
controller->GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
break;
}
case SHOW_MESSAGE_CENTER_BUBBLE: {
internal::RootWindowController* controller =
- Shell::IsLauncherPerDisplayEnabled() ?
- internal::RootWindowController::ForActiveRootWindow() :
- Shell::GetPrimaryRootWindowController();
+ internal::RootWindowController::ForActiveRootWindow();
internal::StatusAreaWidget* status_area_widget =
controller->shelf()->status_area_widget();
if (status_area_widget) {
« no previous file with comments | « no previous file | ash/ash_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698