chrome/browser/resources/options2/content_settings.html - Issue 10826164: Add infobar for PPAPI broker usage.

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

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix merge Created 8 years, 4 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/content_settings/host_content_settings_map.cc ('k') | chrome/browser/resources/options2/content_settings_exceptions_area.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 54c50042e1e3f2e48361460b2e83b62101177649..d4ac0e38289ac2cd4e756450261de71c95c83f15 100644

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

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

@@ -318,6 +318,32 @@

i18n-content="manage_exceptions"></button>

James Hawkins 2012/08/14 14:19:42 nit: i18n-content should be javaScriptCase.

Bernhard Bauer 2012/08/14 23:36:24 Done.

</div>

</section>

+

+ <section>

+ <h3 i18n-content="ppapi_broker_tab_label"></h3>

+ <div>

+ <div class="radio">

+ <label>

+ <input type="radio" name="ppapi-broker" value="allow">

+ <span i18n-content="ppapi_broker_allow"></span>

+ </label>

+ </div>

+ <div class="radio">

+ <label>

+ <input type="radio" name="ppapi-broker" value="ask">

+ <span i18n-content="ppapi_broker_ask"></span>

+ </label>

+ </div>

+ <div class="radio">

+ <label>

+ <input type="radio" name="ppapi-broker" value="block">

+ <span i18n-content="ppapi_broker_block"></span>

+ </label>

+ </div>

+ <button class="exceptions-list-button" contentType="media-stream"

+ i18n-content="manage_exceptions"></button>

+ </div>

+ </section>

<div>