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

Unified Diff: ash/launcher/launcher_view.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/display/display_controller_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.cc
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index f0b4bf5b47e4b558d61a52b5aa0075d8d104c66f..e7eb39cae44e94f2c2c1ca3c2d2031496b973c83 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -1253,8 +1253,6 @@ void LauncherView::LauncherItemChanged(int model_index,
break;
}
case TYPE_BROWSER_SHORTCUT:
- if (!Shell::IsLauncherPerDisplayEnabled())
- break;
// Fallthrough for the new Launcher since it needs to show the activation
// change as well.
case TYPE_APP_SHORTCUT:
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698