chrome/common/pref_names.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/common/pref_names.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/common/pref_names.cc

diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc

index d546cb0cb9f24d18072f9c15ba54a55c76c5617c..f3bfd8e80eda0da7f778ef629d217b0f48058e14 100644

--- a/chrome/common/pref_names.cc

+++ b/chrome/common/pref_names.cc

@@ -5,7 +5,6 @@

#include "chrome/common/pref_names.h"

#include "base/basictypes.h"

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

#include "chrome/common/pref_font_webkit_names.h"

namespace prefs {

@@ -1558,7 +1557,7 @@

const char kGeolocationEnabled[] = "geolocation.enabled";

#endif

-#if BUILDFLAG(ENABLE_GOOGLE_NOW)

+#if defined(ENABLE_GOOGLE_NOW)

// Boolean that is true when Google services can use the user's location.

const char kGoogleGeolocationAccessEnabled[] =

"googlegeolocationaccess.enabled";

« no previous file with comments | « chrome/common/pref_names.h ('k') | tools/grit/grit/util.py » ('j') | no next file with comments »