Chromium Code Reviews| Index: chrome/browser/chrome_browser_main.cc |
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
| index 995060be2d5ec0c8326fa9c9193deb6ace5c92b5..93e83f780836f9da4d2936f1a0be007d2d423dac 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/host_desktop.h" |
| @@ -340,12 +340,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::Get()->GetAppListProfilePath(user_data_dir); |
|
tapted
2013/02/25 07:18:05
note: now non-static
|
| return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
| user_data_dir); |