chrome/browser/ui/app_list/app_list_util.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/ui/app_list/app_list_util.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. 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/app_list/app_list_util.cc

diff --git a/chrome/browser/ui/app_list/app_list_util.cc b/chrome/browser/ui/app_list/app_list_util.cc

index de396d52b7bef2283331bb9c4f46b6dba9e7deaa..12d1b5b5288e821b7a26c5ff4241db04a53da057 100644

--- a/chrome/browser/ui/app_list/app_list_util.cc

+++ b/chrome/browser/ui/app_list/app_list_util.cc

@@ -8,6 +8,7 @@

#include "build/build_config.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/extensions/extension_prefs.h"

+#include "chrome/browser/prefs/pref_registry_simple.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/pref_names.h"

@@ -41,8 +42,8 @@ FilePath GetAppListProfilePath(const FilePath& user_data_dir) {

return user_data_dir.AppendASCII(profile_path);

}

-void RegisterAppListPrefs(PrefServiceSimple* prefs) {

- prefs->RegisterStringPref(prefs::kAppListProfile, "");

+void RegisterAppListPrefs(PrefRegistrySimple* registry) {

+ registry->RegisterStringPref(prefs::kAppListProfile, "");

}

#endif // defined(ENABLE_APP_LIST)

« no previous file with comments | « chrome/browser/ui/app_list/app_list_util.h ('k') | chrome/browser/ui/browser_ui_prefs.h » ('j') | no next file with comments »