chrome/browser/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc

index 787a884cdfe0d6c4378115dbe8b0b23e99407136..10ce23ade6398fb732c9c6706db094e7d62b3d22 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -29,7 +29,6 @@

#include "chrome/browser/ui/browser_list.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

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

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/generated_resources.h"

@@ -452,7 +451,7 @@

{"cookiesShowCookies", IDS_COOKIES_SHOW_COOKIES_BUTTON},

{"flashStorageSettings", IDS_FLASH_STORAGE_SETTINGS},

{"flashStorageUrl", IDS_FLASH_STORAGE_URL},

-#if BUILDFLAG(ENABLE_GOOGLE_NOW)

+#if defined(ENABLE_GOOGLE_NOW)

{"googleGeolocationAccessEnable",

IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX},

#endif

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »