| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 9ded60f31718bcdc4a23721270a93a0ffdf50d87..898478f5597c6e069e6965b9ed83dfedd397b280 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 primary profile, possibly doing some user prompting to pick
|
| // a fallback profile. Returns the newly created profile, or NULL if startup
|
| // should not continue.
|
|
|