chrome/browser/extensions/extension_web_ui.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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/extensions/extension_web_ui.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. 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:

Index: chrome/browser/extensions/extension_web_ui.cc

diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc

index 35b679a520e6bcf7df99c58e3ef49e8b5a2e976c..7e41fca498c9adf1e89cb1d39a0711b0b0cabc36 100644

--- a/chrome/browser/extensions/extension_web_ui.cc

+++ b/chrome/browser/extensions/extension_web_ui.cc

@@ -15,6 +15,7 @@

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

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

#include "chrome/browser/favicon/favicon_util.h"

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

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

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

#include "chrome/browser/profiles/profile.h"

@@ -180,9 +181,9 @@ ExtensionWebUI::bookmark_manager_private_event_router() {

// chrome:// URL overrides

// static

-void ExtensionWebUI::RegisterUserPrefs(PrefServiceSyncable* prefs) {

- prefs->RegisterDictionaryPref(kExtensionURLOverrides,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+void ExtensionWebUI::RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterDictionaryPref(kExtensionURLOverrides,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

// static