chrome/browser/ui/webui/ntp/suggestions_page_handler.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/ntp/suggestions_page_handler.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/ntp/suggestions_page_handler.cc

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

index 9f6b614e403704ed835053b2d0fba3f06d2086ab..f51d7592c8a8b8ce14d19e7729981b0d4ee72e94 100644

--- a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc

+++ b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc

@@ -17,10 +17,11 @@

#include "base/values.h"

#include "chrome/browser/history/page_usage_data.h"

#include "chrome/browser/history/top_sites.h"

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

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

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

-#include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"

#include "chrome/browser/ui/webui/ntp/ntp_stats.h"

+#include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"

#include "chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h"

#include "chrome/browser/ui/webui/ntp/thumbnail_source.h"

#include "chrome/common/chrome_notification_types.h"

@@ -191,6 +192,6 @@ std::string SuggestionsHandler::GetDictionaryKeyForURL(const std::string& url) {

}

// static

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

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

// TODO(georgey) add user preferences (such as own blacklist) as needed.

}