chrome/browser/profiles/profile.cc - Issue 1458653002: New build flag system, convert Google Now flag

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 1458653002: New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 5 years, 1 month 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 04d5e9f35a65f1324c6ab93669a0cc57349df4a4..26ff51ac2bde2b393819ff9b5e801e4a9697aa08 100644

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

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

@@ -98,7 +98,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent);

registry->RegisterBooleanPref(

prefs::kSafeBrowsingExtendedReportingOptInAllowed, true);

-#if defined(ENABLE_GOOGLE_NOW)

+#if BUILDFLAG(ENABLE_GOOGLE_NOW)

Mark Mentovai 2015/11/19 21:52:56 Include what you use.

registry->RegisterBooleanPref(prefs::kGoogleGeolocationAccessEnabled, false);

#endif

// This pref is intentionally outside the above #if. That flag corresponds