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

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

Issue 2684723003: Remove LauncherItemController::Launch, cleanup. (Closed)
Patch Set: Cleanup Created 3 years, 10 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
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 28a0ee2994f429e9055f2b3b96818b73b64689a7..ef0ef130d8438f7d7d0845b54790c45e645eb19f 100644
--- a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
@@ -170,16 +170,9 @@ bool LauncherControllerHelper::IsValidIDForCurrentUser(
}
void LauncherControllerHelper::LaunchApp(const std::string& app_id,
+ const std::string& launch_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);
@@ -225,8 +218,8 @@ ArcAppListPrefs* LauncherControllerHelper::GetArcAppListPrefs() const {
}
void LauncherControllerHelper::ExtensionEnableFlowFinished() {
- LaunchApp(extension_enable_flow_->extension_id(), ash::LAUNCH_FROM_UNKNOWN,
- ui::EF_NONE);
+ LaunchApp(extension_enable_flow_->extension_id(), std::string(),
+ ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
extension_enable_flow_.reset();
}

Powered by Google App Engine
This is Rietveld 408576698