chrome/browser/profiles/profile.cc - Issue 1475883002: Revert of 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 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/profiles/profile.cc

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

index 85664421bfc85ba2615d6b323627299575bc447f..04d5e9f35a65f1324c6ab93669a0cc57349df4a4 100644

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

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

@@ -12,7 +12,6 @@

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

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

#include "chrome/browser/sync/profile_sync_service_factory.h"

-#include "chrome/common/features.h"

#include "chrome/common/pref_names.h"

#include "components/browser_sync/browser/profile_sync_service.h"

#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"

@@ -99,7 +98,7 @@

registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent);

registry->RegisterBooleanPref(

prefs::kSafeBrowsingExtendedReportingOptInAllowed, true);

-#if BUILDFLAG(ENABLE_GOOGLE_NOW)

+#if defined(ENABLE_GOOGLE_NOW)

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

#endif

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

« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/resources/BUILD.gn » ('j') | no next file with comments »