chrome/browser/resources/options/content_settings.html - Issue 171763004: Remove pp_ifdef from resource files in chrome/browser and chrome/renderer.

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/resources/options/content_settings.html

Issue 171763004: Remove pp_ifdef from resource files in chrome/browser and chrome/renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

Download patch

« no previous file with comments | « chrome/browser/resources/options/certificate_manager.html ('k') | chrome/browser/resources/options/language_options.html » ('j') | chrome/browser/resources/print_preview/print_preview.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/content_settings.html

diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html

index c0871a863244c27d97a29f1496160555f21b3af8..3dacaaf38a6686e11b937d4f7c38a48d54bb01b2 100644

--- a/chrome/browser/resources/options/content_settings.html

+++ b/chrome/browser/resources/options/content_settings.html

@@ -285,7 +285,7 @@

</span>

</div>

-<if expr="pp_ifdef('enable_google_now')">

+<if expr="enable_google_now">

<input id="googleGeolocationAccessEnabled"

@@ -396,7 +396,7 @@

</div>

</section>

-<if expr="pp_ifdef('chromeos') or is_win">

+<if expr="chromeos or is_win">

<h3 i18n-content="protectedContentTabLabel"

@@ -411,7 +411,7 @@

</label>

</div>

-<if expr="pp_ifdef('chromeos')">

+<if expr="chromeos">

Nico 2014/02/19 01:08:43 Should this be indented to make it more obvious th

newt (away) 2014/02/19 01:43:15 Maybe, though it could be confusing to have two in

Nico 2014/02/19 01:44:50 Maybe marginally better? Up to you.

<button id="protected-content-exceptions"

class="exceptions-list-button" contentType="protectedContent"