| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index ea30c8e88c8f02e3f1c77846e1cc66dc365e8314..75479536ad1328a3955e910bdc88f680478d6256 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -93,7 +93,7 @@
|
| #include "chrome/browser/service/service_process_control.h"
|
| #include "chrome/browser/shell_integration.h"
|
| #include "chrome/browser/translate/translate_manager.h"
|
| -#include "chrome/browser/ui/app_list/app_list_util.h"
|
| +#include "chrome/browser/ui/app_list/app_list_service.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/startup/default_browser_prompt.h"
|
| @@ -339,12 +339,10 @@ base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
|
| command_line.GetSwitchValuePath(switches::kProfileDirectory));
|
| }
|
|
|
| -#if defined(ENABLE_APP_LIST)
|
| // 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 chrome::GetAppListProfilePath(user_data_dir);
|
| -#endif
|
| + return AppListService::GetAppListProfilePath(user_data_dir);
|
|
|
| return g_browser_process->profile_manager()->GetLastUsedProfileDir(
|
| user_data_dir);
|
|
|