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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/content_settings.html

Issue 11078023: Add controlled setting indicators for content settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark which of the policies considered can be recommended. Created 8 years, 2 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
« chrome/browser/resources/options/chromeos/network_list.js ('K') | « chrome/browser/resources/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings.js » ('j') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 ca33602db96d5a1fdd5cc1c12cf551c1443dd00d..b22cfe93ca413dbf5d253ef602a0bf6226f3e87d 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -11,24 +11,36 @@
<input type="radio" name="cookies" value="allow">
<span i18n-content="cookies_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="cookies" value="allow">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="cookies" value="session">
<span i18n-content="cookies_session_only"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="cookies" value="session">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="cookies" value="block">
<span i18n-content="cookies_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="cookies" value="block">
+ </span>
</div>
<div class="checkbox">
<label>
<input pref="profile.block_third_party_cookies" type="checkbox">
<span i18n-content="cookies_block_3rd_party"></span>
</label>
+ <span class="controlled-setting-indicator"
+ pref="profile.block_third_party_cookies">
+ </span>
</div>
<!-- TODO(jochen): remove the div with the clear cookies on exit option
once this has shipped. -->
@@ -59,12 +71,18 @@
<input type="radio" name="images" value="allow">
<span i18n-content="images_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="images" value="allow">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="images" value="block">
<span i18n-content="images_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="images" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="images"
@@ -81,12 +99,18 @@
<input type="radio" name="javascript" value="allow">
<span i18n-content="javascript_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="javascript" value="allow">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="javascript" value="block">
<span i18n-content="javascript_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="javascript" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="javascript"
@@ -127,18 +151,27 @@
<input type="radio" name="plugins" value="allow">
<span i18n-content="plugins_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="plugins" value="allow">
+ </span>
</div>
<div id="click_to_play" class="radio">
<label>
<input type="radio" name="plugins" value="ask">
<span i18n-content="plugins_ask"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="plugins" value="ask">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="plugins" value="block">
<span i18n-content="plugins_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="plugins" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="plugins"
@@ -159,12 +192,18 @@
<input type="radio" name="popups" value="allow">
<span i18n-content="popups_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="popups" value="allow">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="popups" value="block">
<span i18n-content="popups_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="popups" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="popups"
@@ -181,18 +220,27 @@
<input type="radio" name="location" value="allow">
<span i18n-content="location_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="location" value="allow">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="location" value="ask">
<span i18n-content="location_ask"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="location" value="ask">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="location" value="block">
<span i18n-content="location_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="location" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="location"
@@ -209,18 +257,27 @@
<input type="radio" name="notifications" value="allow">
<span i18n-content="notifications_allow"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="notifications" value="allow">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="notifications" value="ask">
<span i18n-content="notifications_ask"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="notifications" value="ask">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="notifications" value="block">
<span i18n-content="notifications_block"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="notifications" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="notifications"
@@ -325,12 +382,18 @@
<input type="radio" name="media-stream" value="ask">
<span i18n-content="mediaStreamAsk"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="media-stream" value="ask">
+ </span>
</div>
<div class="radio">
<label>
<input type="radio" name="media-stream" value="block">
<span i18n-content="mediaStreamBlock"></span>
</label>
+ <span class="controlled-setting-indicator"
+ content-setting="media-stream" value="block">
+ </span>
</div>
<div class="settings-row">
<button class="exceptions-list-button" contentType="media-stream"
« chrome/browser/resources/options/chromeos/network_list.js ('K') | « chrome/browser/resources/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings.js » ('j') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698