[tabbed options] tidy up some bits of content settings

- fix OTR lists (we weren't getting the notifications for changed settings)
- CSS improvements
- move around the links

BUG=64153
TEST=manual

Review URL: http://codereview.chromium.org/6059006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69999 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 38 insertions, 13 deletions

diff --git a/chrome/browser/resources/options/content_settings.css b/chrome/browser/resources/options/content_settings.css
index eea0c30..be2cc17 100644
--- a/chrome/browser/resources/options/content_settings.css
+++ b/chrome/browser/resources/options/content_settings.css
@@ -5,9 +5,10 @@ found in the LICENSE file.
 */
 
 .exceptionPattern {
-  -webkit-box-flex: 1;
   display: -webkit-box;
+  margin-right: 4px;
   overflow: hidden;
+  -webkit-box-flex: 1;
   white-space: nowrap;
 }
 
@@ -17,9 +18,18 @@ found in the LICENSE file.
   margin-right: 20px;
 }
 
+select.exceptionSetting {
+  vertical-align: middle;
+}
+
+/* Hacks to make the <select> align better with the <input>. */
+html[toolkit=gtk] select.exceptionSetting {
+  height: 22px;
+  margin-top: 1px;
+}
+
 #exceptionColumnHeaders {
   display: -webkit-box;
-  margin-bottom: 4px;
   margin-top: 17px;
   -webkit-margin-start: 3px;
 }
@@ -35,3 +45,12 @@ found in the LICENSE file.
 #exceptionBehaviorColumn {
   width: 140px;
 }
+
+.otr_explanation {
+  font-style: italic;
+}
+
+#contentSettingsExceptionsArea list {
+  margin-bottom: 10px;
+  margin-top: 4px;
+}
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html
index 1c1f45b..c2693f3 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -23,13 +23,11 @@
             pref="profile.clear_site_data_on_exit" type="checkbox">
         <span i18n-content="cookies_clear_on_exit"></span>
       </label>
-      <button id="show-cookies-button"
-          i18n-content="cookies_show_cookies"></button>
-      <a i18n-values="href:flash_storage_url"
-          i18n-content="flash_storage_settings" target="_blank"></a>
 
       <button class="exceptionsListButton" contentType="cookies"
           i18n-content="manage_exceptions"></button>
+      <button id="show-cookies-button"
+          i18n-content="cookies_show_cookies"></button>
    </div>
   </section>
 
@@ -88,8 +86,6 @@
 
       <button class="exceptionsListButton" contentType="plugins"
           i18n-content="manage_exceptions"></button>
-
-      <a i18n-content="disable_individual_plugins" id="plugins-tab" href="#"></a>
     </div>
   </section>
 
diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.html b/chrome/browser/resources/options/content_settings_exceptions_area.html
index ac47793..d4289bb 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.html
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.html
@@ -9,15 +9,19 @@
   <div contentType="cookies">
     <list mode="normal"></list>
     <div>
-      <span i18n-content="otr_exceptions_explanation"></span>
+      <span class="otr_explanation"
+            i18n-content="otr_exceptions_explanation"></span>
       <list mode="otr"></list>
     </div>
+    <a i18n-values="href:flash_storage_url"
+       i18n-content="flash_storage_settings" target="_blank"></a>
   </div>
 
   <div contentType="images">
     <list mode="normal"></list>
     <div>
-      <span i18n-content="otr_exceptions_explanation"></span>
+      <span class="otr_explanation"
+            i18n-content="otr_exceptions_explanation"></span>
       <list mode="otr"></list>
     </div>
   </div>
@@ -25,7 +29,8 @@
   <div contentType="javascript">
     <list mode="normal"></list>
     <div>
-      <span i18n-content="otr_exceptions_explanation"></span>
+      <span class="otr_explanation"
+            i18n-content="otr_exceptions_explanation"></span>
       <list mode="otr"></list>
     </div>
   </div>
@@ -33,15 +38,18 @@
   <div contentType="plugins">
     <list mode="normal"></list>
     <div>
-      <span i18n-content="otr_exceptions_explanation"></span>
+      <span class="otr_explanation"
+            i18n-content="otr_exceptions_explanation"></span>
       <list mode="otr"></list>
     </div>
+    <a i18n-content="disable_individual_plugins" id="plugins-tab" href="#"></a>
   </div>
 
   <div contentType="popups">
     <list mode="normal"></list>
     <div>
-      <span i18n-content="otr_exceptions_explanation"></span>
+      <span class="otr_explanation"
+            i18n-content="otr_exceptions_explanation"></span>
       <list mode="otr"></list>
     </div>
   </div>
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index 4235eb5..c8aa731 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -158,6 +158,8 @@ function load() {
   // Allow platform specific CSS rules.
   if (cr.isMac)
     document.documentElement.setAttribute('os', 'mac');
+  if (cr.isLinux)
+    document.documentElement.setAttribute('toolkit', 'gtk');
   if (cr.isViews)
     document.documentElement.setAttribute('toolkit', 'views');
 }