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

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

index 21996a461e7b46b2d68629406cd327a60e29324c..47d1a76c459b07d89f374e372c3c3b522de3bd1a 100644

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

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

@@ -20,6 +20,7 @@

#include "base/utf_string_conversions.h"

#include "chrome/browser/defaults.h"

#include "chrome/browser/extensions/app_launcher.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/sessions/session_types.h"

@@ -281,15 +282,15 @@ void NewTabUI::InitializeCSSCaches() {

}

// static

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

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

#if !defined(OS_ANDROID)

- AppLauncherHandler::RegisterUserPrefs(prefs);

- NewTabPageHandler::RegisterUserPrefs(prefs);

+ AppLauncherHandler::RegisterUserPrefs(registry);

+ NewTabPageHandler::RegisterUserPrefs(registry);

if (NewTabUI::IsDiscoveryInNTPEnabled())

- SuggestionsHandler::RegisterUserPrefs(prefs);

+ SuggestionsHandler::RegisterUserPrefs(registry);

#endif

- MostVisitedHandler::RegisterUserPrefs(prefs);

- browser_sync::ForeignSessionHandler::RegisterUserPrefs(prefs);

+ MostVisitedHandler::RegisterUserPrefs(registry);

+ browser_sync::ForeignSessionHandler::RegisterUserPrefs(registry);

}

// static