Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(890)

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: review 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
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..0e1154aabcf0d4e998e185f27c230f07ef26e2e8 100644
--- a/chrome/browser/resources/options2/content_settings.html
+++ b/chrome/browser/resources/options2/content_settings.html
@@ -43,7 +43,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="cookies"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
<button id="show-cookies-button"
i18n-content="cookies_show_cookies"></button>
<button id="show-app-cookies-button"
@@ -67,7 +67,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="images"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- JavaScript filter -->
@@ -87,7 +87,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="javascript"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- Handlers settings -->
@@ -135,7 +135,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="plugins"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
<div id="disable-plugins-container">
<a href="chrome://plugins" i18n-content="disableIndividualPlugins"
target="_blank"></a>
@@ -159,7 +159,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="popups"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- Location filter -->
@@ -185,7 +185,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="location"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- Notifications filter tab contents -->
@@ -211,7 +211,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="notifications"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- Fullscreen filter -->
@@ -219,7 +219,7 @@
<h3 i18n-content="fullscreen_tab_label"></h3>
<div>
<button class="exceptions-list-button" contentType="fullscreen"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- Mouse Lock filter -->
@@ -245,7 +245,7 @@
</label>
</div>
<button class="exceptions-list-button" contentType="mouselock"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<!-- Intent registration filter -->
@@ -277,7 +277,7 @@
</div>
<button class="exceptions-list-button"
contentType="pepper-flash-cameramic"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
</div>
</section>
<if expr="pp_ifdef('chromeos')">
@@ -315,7 +315,33 @@
</label>
</div>
<button class="exceptions-list-button" contentType="media-stream"
- i18n-content="manage_exceptions"></button>
+ i18n-content="manageExceptions"></button>
+ </div>
+ </section>
+ <!-- PPAPI broker -->
+ <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="manageExceptions"></button>
</div>
</section>
<section id="media-galleries-section" hidden>

Powered by Google App Engine
This is Rietveld 408576698