chrome/browser/profiles/profile.cc - Issue 938713004: Add Now setting and migration logic.

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/profiles/profile.cc

Issue 938713004: Add Now setting and migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: style comments from robliao@ Created 5 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/profiles/profile.cc

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index 7292b30cd3f5bb9673de72062d66db53c33aa14a..141dcdd85fa1a80c8b4ed49d63b01c6072daa5bf 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -113,6 +113,12 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

false,

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

#endif

+ // This pref is intentionally outside the above #if.

+ // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827

+ registry->RegisterBooleanPref(

+ prefs::kGoogleNowLauncherEnabled,

+ true,

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

registry->RegisterBooleanPref(

prefs::kDisableExtensions,

false,