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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 127343004: Avoid loading the last used browser profile in app_controller_mac when it's not needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: need FPL Created 6 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
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 7271cb814faaa0fb3d33d6db8e5671634bb5f5de..1eb36fc0d5fb0805e470814e50cbecce563b7f4b 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -300,26 +300,6 @@ PrefService* InitializeLocalState(
return local_state;
}
-// Returns the path that contains the profile that should be loaded
-// on process startup.
-base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
- const CommandLine& command_line) {
- if (command_line.HasSwitch(switches::kProfileDirectory)) {
- return user_data_dir.Append(
- command_line.GetSwitchValuePath(switches::kProfileDirectory));
- }
-
- // If we are showing the app list then chrome isn't shown so load the app
- // list's profile rather than chrome's.
- if (command_line.HasSwitch(switches::kShowAppList)) {
- return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
- GetProfilePath(user_data_dir);
- }
-
- return g_browser_process->profile_manager()->GetLastUsedProfileDir(
- user_data_dir);
-}
-
// Initializes the profile, possibly doing some user prompting to pick a
// fallback profile. Returns the newly created profile, or NULL if startup
// should not continue.

Powered by Google App Engine
This is Rietveld 408576698