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

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

Issue 12207104: Refactor app_list_util.h into AppListService abstract base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move disabled to selector Created 7 years, 10 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/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 3bd71b69ae0865e8907d9834acbf0c330981b8bd..11b9c4ff6f9946a8d35e3a7eafa3922c213db73b 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -47,6 +47,7 @@
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sessions/session_service_factory.h"
#include "chrome/browser/shell_integration.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
@@ -103,10 +104,6 @@
#include "base/win/windows_version.h"
#endif
-#if defined(ENABLE_APP_LIST)
-#include "chrome/browser/ui/app_list/app_list_util.h"
-#endif
-
using content::ChildProcessSecurityPolicy;
using content::WebContents;
using extensions::Extension;
@@ -334,13 +331,11 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit))
base::StatisticsRecorder::set_dump_on_exit(true);
-#if defined(ENABLE_APP_LIST)
- chrome::InitAppList(profile);
+ AppListService::InitAll(profile);
if (command_line_.HasSwitch(switches::kShowAppList)) {
- chrome::ShowAppList(profile);
+ AppListService::Get()->ShowAppList(profile);
return true;
}
-#endif
// Open the required browser windows and tabs. First, see if
// we're being run as an application window. If so, the user

Powered by Google App Engine
This is Rietveld 408576698