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

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

Issue 2523053004: Enhance chrome.app.window API for shelf integration with restore support (Closed)
Patch Set: Review v5 Created 4 years 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
Index: chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
index 481db177854cafd8229aa0355aeed6c3d88b8407..06423c8cb0b7efb5ce5e51b0c446f4dfaa226e09 100644
--- a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
@@ -169,6 +169,14 @@ bool LauncherControllerHelper::IsValidIDForCurrentUser(
void LauncherControllerHelper::LaunchApp(const std::string& app_id,
ash::LaunchSource source,
int event_flags) {
+ LaunchAppWithLaunchId(app_id, "", source, event_flags);
+}
+
+void LauncherControllerHelper::LaunchAppWithLaunchId(
+ const std::string& app_id,
+ const std::string& launch_id,
+ ash::LaunchSource source,
+ int event_flags) {
const ArcAppListPrefs* arc_prefs = GetArcAppListPrefs();
if (arc_prefs && arc_prefs->IsRegistered(app_id)) {
arc::LaunchApp(profile_, app_id, event_flags);
@@ -204,6 +212,7 @@ void LauncherControllerHelper::LaunchApp(const std::string& app_id,
params.override_url = net::AppendQueryParameter(
extension_url, extension_urls::kWebstoreSourceField, source_value);
}
+ params.launch_id = launch_id;
OpenApplication(params);
}
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_controller_helper.h ('k') | chrome/browser/ui/extensions/app_launch_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698