chrome/browser/ui/webui/instant_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/ui/webui/instant_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/ui/webui/instant_ui.cc

diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc

index 14df056f5140a6d8743c483d4ba710322492abc3..05e6c8b4f2313bd8b5ac592c5419b88ede593302 100644

--- a/chrome/browser/ui/webui/instant_ui.cc

+++ b/chrome/browser/ui/webui/instant_ui.cc

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

#include "base/stringprintf.h"

#include "base/time.h"

#include "chrome/browser/instant/instant_controller.h"

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

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

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

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

@@ -149,7 +150,7 @@ InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) {

}

// static

-void InstantUI::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {

- user_prefs->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",

- PrefServiceSyncable::UNSYNCABLE_PREF);

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

+ registry->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}