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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

Issue 11766002: Launch non-shortcut apps in ChromeLauncherControllerPerApp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
index 1c36328c40020131c63ef040e30a67b53e603600..17d5bc618fddaa9d0cb080eda3cc6f0478569dd7 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
@@ -434,13 +434,14 @@ void ChromeLauncherControllerPerApp::ActivateApp(const std::string& app_id,
// If there is an existing non-shortcut controller for this app, open it.
ash::LauncherID id = GetLauncherIDForAppID(app_id);
-
- // Only pinned applications will be handled.
- if (!id)
+ if (id) {
+ LauncherItemController* controller = id_to_item_controller_map_[id];
+ controller->Activate();
return;
+ }
- LauncherItemController* controller = id_to_item_controller_map_[id];
- controller->Activate();
+ // Otherwise launch the app.
+ LaunchApp(app_id, event_flags);
}
extensions::ExtensionPrefs::LaunchType
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698