| 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 4eec2313a5868f16c2b416679c89f65f9a312674..251ad1212e4b3c603a6386597d8ecdbb9adffded 100644
|
| --- a/chrome/browser/resources/options/content_settings.html
|
| +++ b/chrome/browser/resources/options/content_settings.html
|
| @@ -5,7 +5,7 @@
|
| <!-- Cookie filter tab contents -->
|
| <section>
|
| <h3 i18n-content="cookiesTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="cookies" value="allow">
|
| @@ -64,20 +64,11 @@
|
| i18n-content="cookiesShowCookies"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="cookies-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="cookies" i18n-content="websitesManage"></button>
|
| - <button id="show-cookies-button"
|
| - i18n-content="cookiesShowCookies"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- Image filter -->
|
| <section>
|
| <h3 i18n-content="imagesTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="images" value="allow">
|
| @@ -103,18 +94,11 @@
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="images-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="images" i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- JavaScript filter -->
|
| <section>
|
| <h3 i18n-content="javascriptTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="javascript" value="allow">
|
| @@ -140,13 +124,6 @@
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="javascript-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="javascript" i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- Handlers settings -->
|
| <section id="handlers-section">
|
| @@ -175,7 +152,7 @@
|
| <!-- Plugins filter -->
|
| <section>
|
| <h3 i18n-content="pluginsTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input id="plugins-allow-radio" type="radio" name="plugins"
|
| @@ -216,18 +193,11 @@
|
| target="_blank"></a>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="plugins-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="plugins" i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- Pop-ups filter -->
|
| <section>
|
| <h3 i18n-content="popupsTabLabel" class="content-settings-header"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="popups" value="allow">
|
| @@ -253,18 +223,11 @@
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="popups-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="popups" i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- Location filter -->
|
| <section>
|
| <h3 i18n-content="locationTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="location" value="allow">
|
| @@ -316,18 +279,11 @@
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="location-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="geolocation" i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- Notifications filter tab contents -->
|
| <section id="notifications-section">
|
| <h3 i18n-content="notificationsTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="notifications" value="allow">
|
| @@ -363,14 +319,6 @@
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="notifications-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="notifications"
|
| - i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- Fullscreen filter -->
|
| <section>
|
| @@ -488,7 +436,7 @@
|
| </span>
|
| </label>
|
| </div>
|
| - <div class="settings-row replace-with-website-settings">
|
| + <div class="settings-row">
|
| <button class="exceptions-list-button" contentType="media-stream"
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| @@ -498,12 +446,6 @@
|
| i18n-values="href:mediaPepperFlashGlobalPrivacyURL"></a>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="media-stream" i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- PPAPI broker -->
|
| <section>
|
| @@ -548,7 +490,7 @@
|
| <!-- Automatic Downloads filter -->
|
| <section>
|
| <h3 i18n-content="multipleAutomaticDownloadsTabLabel"></h3>
|
| - <div class="replace-with-website-settings">
|
| + <div>
|
| <div class="radio controlled-setting-with-label">
|
| <label>
|
| <input type="radio" name="multiple-automatic-downloads"
|
| @@ -590,14 +532,6 @@
|
| i18n-content="manageExceptions"></button>
|
| </div>
|
| </div>
|
| - <div class="experimental-website-settings" hidden>
|
| - <span id="multiple-automatic-downloads-default-string"></span>
|
| - <div class="settings-row">
|
| - <button class="website-settings-permission-button"
|
| - contentType="multiple-automatic-downloads"
|
| - i18n-content="websitesManage"></button>
|
| - </div>
|
| - </div>
|
| </section>
|
| <!-- MIDI system exclusive messages filter -->
|
| <section>
|
|
|