chrome/browser/prefs/browser_prefs.cc - Issue 12207104: Refactor app_list_util.h into AppListService abstract base.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.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: rebase for r184604=r184636 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

« no previous file with comments | « chrome/browser/extensions/api/webstore_private/webstore_private_api.cc ('k') | chrome/browser/ui/app_list/app_list_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index e671e318abf23fba74aadb1e1801a258560868b7..9953c498c27bc5a164559d0c6b5a55e2b74ecf99 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -69,7 +69,7 @@

#include "chrome/browser/task_manager/task_manager.h"

#include "chrome/browser/translate/translate_prefs.h"

#include "chrome/browser/ui/alternate_error_tab_observer.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/autofill/autofill_dialog_controller_impl.h"

#include "chrome/browser/ui/browser_instant_controller.h"

#include "chrome/browser/ui/browser_ui_prefs.h"

@@ -173,6 +173,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);

// Please keep this list alphabetized.

+ AppListService::RegisterPrefs(registry);

apps::RegisterPrefs(registry);

browser_shutdown::RegisterPrefs(registry);

BrowserProcessImpl::RegisterPrefs(registry);

@@ -251,10 +252,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

#if defined(OS_MACOSX)

confirm_quit::RegisterLocalState(registry);

#endif

-#if defined(ENABLE_SETTINGS_APP)

- chrome::RegisterAppListPrefs(registry);

-#endif

}

void RegisterUserPrefs(PrefService* user_prefs,