| 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 f9da194af37f073147a6bd90bd60ad89527ee6dc..27d9564090b40b02b6e10f010e33cade4f19aead 100644
|
| --- a/chrome/browser/resources/options/content_settings.html
|
| +++ b/chrome/browser/resources/options/content_settings.html
|
| @@ -9,35 +9,41 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="cookies" value="allow">
|
| - <span i18n-content="cookies_allow"></span>
|
| + <span>
|
| + <span i18n-content="cookies_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="cookies" value="allow"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="cookies" value="allow"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="cookies" value="session">
|
| - <span i18n-content="cookies_session_only"></span>
|
| + <span>
|
| + <span i18n-content="cookies_session_only"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="cookies" value="session"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="cookies" value="session"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="cookies" value="block">
|
| - <span i18n-content="cookies_block"></span>
|
| + <span>
|
| + <span i18n-content="cookies_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="cookies" value="block"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="cookies" value="block"></span>
|
| </div>
|
| <div class="checkbox controlled-setting-with-label">
|
| <label>
|
| <input pref="profile.block_third_party_cookies" type="checkbox">
|
| - <span i18n-content="cookies_block_3rd_party"></span>
|
| + <span>
|
| + <span i18n-content="cookies_block_3rd_party"></span>
|
| + <span class="controlled-setting-indicator"
|
| + pref="profile.block_third_party_cookies"></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. -->
|
| @@ -67,18 +73,19 @@
|
| <label>
|
| <input type="radio" name="images" value="allow">
|
| <span i18n-content="images_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="images" value="allow"></span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="images" value="allow"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="images" value="block">
|
| - <span i18n-content="images_block"></span>
|
| + <span>
|
| + <span i18n-content="images_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="images" value="block"></span>
|
| + </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"
|
| @@ -93,18 +100,22 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="javascript" value="allow">
|
| - <span i18n-content="javascript_allow"></span>
|
| + <span>
|
| + <span i18n-content="javascript_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="javascript" value="allow"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="javascript" value="allow"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="javascript" value="block">
|
| - <span i18n-content="javascript_block"></span>
|
| + <span>
|
| + <span i18n-content="javascript_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="javascript" value="block"></span>
|
| + </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"
|
| @@ -143,26 +154,32 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="plugins" value="allow">
|
| - <span i18n-content="plugins_allow"></span>
|
| + <span>
|
| + <span i18n-content="plugins_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="plugins" value="allow"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="plugins" value="allow"></span>
|
| </div>
|
| <div id="click_to_play" class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="plugins" value="ask">
|
| - <span i18n-content="plugins_ask"></span>
|
| + <span>
|
| + <span i18n-content="plugins_ask"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="plugins" value="ask"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="plugins" value="ask"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="plugins" value="block">
|
| - <span i18n-content="plugins_block"></span>
|
| + <span>
|
| + <span i18n-content="plugins_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="plugins" value="block"></span>
|
| + </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"
|
| @@ -181,18 +198,22 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="popups" value="allow">
|
| - <span i18n-content="popups_allow"></span>
|
| + <span>
|
| + <span i18n-content="popups_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="popups" value="allow"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="popups" value="allow"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="popups" value="block">
|
| - <span i18n-content="popups_block"></span>
|
| + <span>
|
| + <span i18n-content="popups_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="popups" value="block"></span>
|
| + </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"
|
| @@ -207,27 +228,33 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="location" value="allow">
|
| - <span i18n-content="location_allow"></span>
|
| + <span>
|
| + <span i18n-content="location_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="location" value="allow"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="location" value="allow"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="location" value="ask">
|
| - <span i18n-content="location_ask"></span>
|
| + <span>
|
| + <span i18n-content="location_ask"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="location" value="ask"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="location" value="ask"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="location"
|
| value="block">
|
| - <span i18n-content="location_block"></span>
|
| + <span>
|
| + <span i18n-content="location_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="location" value="block"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="location" value="block"></span>
|
| </div>
|
| <if expr="enable_google_now">
|
| <div class="checkbox controlled-setting-with-label"
|
| @@ -236,10 +263,12 @@
|
| <input pref="googlegeolocationaccess.enabled"
|
| metric="Options_GoogleGeolocationAccessCheckbox"
|
| type="checkbox">
|
| - <span i18n-content="googleGeolocationAccessEnable"></span>
|
| + <span>
|
| + <span i18n-content="googleGeolocationAccessEnable"></span>
|
| + <span class="controlled-setting-indicator"
|
| + pref="googlegeolocationaccess.enabled"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - pref="googlegeolocationaccess.enabled"></span>
|
| </div>
|
| </if>
|
| <div class="settings-row">
|
| @@ -255,26 +284,32 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="notifications" value="allow">
|
| - <span i18n-content="notifications_allow"></span>
|
| + <span>
|
| + <span i18n-content="notifications_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="notifications" value="allow"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="notifications" value="allow"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="notifications" value="ask">
|
| - <span i18n-content="notifications_ask"></span>
|
| + <span>
|
| + <span i18n-content="notifications_ask"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="notifications" value="ask"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="notifications" value="ask"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="notifications" value="block">
|
| - <span i18n-content="notifications_block"></span>
|
| + <span>
|
| + <span i18n-content="notifications_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="notifications" value="block"></span>
|
| + </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"
|
| @@ -362,20 +397,24 @@
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="media-stream" value="ask">
|
| - <span id="media-stream-ask-label" i18n-content="mediaStreamAsk">
|
| + <span>
|
| + <span id="media-stream-ask-label" i18n-content="mediaStreamAsk">
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="media-stream" value="ask"></span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="media-stream" value="ask"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input id="media-stream-block" type="radio" name="media-stream"
|
| value="block">
|
| - <span id="media-stream-block-label" i18n-content="mediaStreamBlock">
|
| + <span>
|
| + <span id="media-stream-block-label"
|
| + i18n-content="mediaStreamBlock"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="media-stream" value="block"></span>
|
| </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"
|
| @@ -424,29 +463,36 @@
|
| <label>
|
| <input type="radio" name="multiple-automatic-downloads"
|
| value="allow">
|
| - <span i18n-content="multiple-automatic-downloads_allow"></span>
|
| + <span>
|
| + <span i18n-content="multiple-automatic-downloads_allow"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="multiple-automatic-downloads" value="allow">
|
| + </span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="multiple-automatic-downloads" value="allow">
|
| - </span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="multiple-automatic-downloads" value="ask">
|
| - <span i18n-content="multiple-automatic-downloads_ask"></span>
|
| + <span>
|
| + <span i18n-content="multiple-automatic-downloads_ask"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="multiple-automatic-downloads" value="ask">
|
| + </span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="multiple-automatic-downloads" value="ask"></span>
|
| </div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="multiple-automatic-downloads"
|
| value="block">
|
| - <span i18n-content="multiple-automatic-downloads_block"></span>
|
| + <span>
|
| + <span i18n-content="multiple-automatic-downloads_block"></span>
|
| + <span class="controlled-setting-indicator"
|
| + content-setting="multiple-automatic-downloads" value="block">
|
| + </span>
|
| + </span>
|
| </label>
|
| - <span class="controlled-setting-indicator"
|
| - content-setting="multiple-automatic-downloads" value="block">
|
| - </span>
|
| </div>
|
| <div class="settings-row">
|
| <button class="exceptions-list-button"
|
|
|