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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 350883002: Refactor handling of --show-app-list command line. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix disabled stub [android] Created 6 years, 5 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 | « chrome/browser/ui/app_list/app_list_service_disabled.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 6039cae2b545e837a19338f09b84b37b123cf685..794dcb164e8b5f935081cb567078d8df9e12cb91 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -335,7 +335,9 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
profile->GetNetworkPredictor()->EnablePredictor(false);
}
- AppListService::InitAll(profile);
+ if (AppListService::HandleLaunchCommandLine(command_line_, profile))
+ return true;
+
if (command_line_.HasSwitch(switches::kAppId)) {
std::string app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
const Extension* extension = GetPlatformApp(profile, app_id);
@@ -353,12 +355,6 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
OpenApplicationWithReenablePrompt(params);
return true;
}
- } else if (command_line_.HasSwitch(switches::kShowAppList)) {
- // This switch is used for shortcuts on the native desktop.
- AppListService::RecordShowTimings(command_line_);
- AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
- ShowForProfile(profile);
- return true;
}
// Open the required browser windows and tabs. First, see if
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_disabled.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698