DOMUI: Fix nits from UI review.

* Home page URL field now styled.
* Fixed jiggling rows in search engine manager list.
* Fixed 'make default' button margins.
* Added better margin for 'Get themes' link.
* Fixed margins of AF add buttons.
* Revamped search page title.
* Fixed the margin of the content of language options page.
* Added indent for 'Clear browser data' checkboxes.
* Removed default height of cookies list.

BUG=none
TEST=none

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

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

10 files changed, 67 insertions, 45 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index bbb10af..52f4b39 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7135,7 +7135,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Signing in...
       </message>
       <message name="IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION" desc="The label of the 'Enable phishing and malware protection' checkbox">
-        Enable phishing and malware protection.
+        Enable phishing and malware protection
       </message>
       <message name="IDS_OPTIONS_SSL_GROUP_DESCRIPTION" desc="The description of the 'SSL Connections' group">
         Computer-wide SSL settings:
@@ -7177,7 +7177,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- Options search page strings. -->
       <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="">
-        Search
+        Search Results
       </message>
       <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="">
         No matches were found.
@@ -7191,7 +7191,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- Misc advanced option description strings. -->
       <message name="IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables DNS prefetching.  DNS prefetching involves scanning pages and user text entries, guessing what domain the user may next navigate to, and obtaining the domain's DNS information for that URL in advance. ">
-        Use DNS pre-fetching to improve page load performance.
+        Use DNS pre-fetching to improve page load performance
       </message>
 
       <!-- Collected cookies window -->
@@ -7780,11 +7780,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
         You may optionally disable these services
       </message>
       <message name="IDS_OPTIONS_LINKDOCTOR_PREF" desc="The documentation string of the 'Use Link Doctor' preference">
-        Show suggestions for navigation errors
+        Use a web service to help resolve navigation errors
       </message>
 
       <message name="IDS_OPTIONS_SUGGEST_PREF" desc="The documentation string of the 'Use Suggest' preference">
-        Show suggestions to help complete searches and URLs
+        Use a prediction service to help complete searches and URLs typed in the address bar
       </message>
 
       <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
diff --git a/chrome/browser/resources/options/autofill_options.css b/chrome/browser/resources/options/autofill_options.css
index 5320dd72..ab6376c 100644
--- a/chrome/browser/resources/options/autofill_options.css
+++ b/chrome/browser/resources/options/autofill_options.css
@@ -16,3 +16,8 @@
   border-top: 1px solid #D9D9D9;
   padding: 5px 10px;
 }
+
+#autofill-add-address,
+#autofill-add-creditcard {
+  margin: 2px 0;
+}
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.css b/chrome/browser/resources/options/clear_browser_data_overlay.css
index a6b970d..b21ea50 100644
--- a/chrome/browser/resources/options/clear_browser_data_overlay.css
+++ b/chrome/browser/resources/options/clear_browser_data_overlay.css
@@ -12,6 +12,11 @@ found in the LICENSE file.
   margin: 5px 0;
 }
 
+#clear-data-checkboxes {
+  -webkit-padding-start: 8px;
+  margin: 5px 0;
+}
+
 #cbdThrobber {
   background-image: url("../../../../app/resources/throbber.png");
   display: inline-block;
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html
index 8b1c23e..0af25ef 100644
--- a/chrome/browser/resources/options/clear_browser_data_overlay.html
+++ b/chrome/browser/resources/options/clear_browser_data_overlay.html
@@ -7,36 +7,38 @@
         pref="browser.clear_data.time_period"
         dataType="number">
     </select>
-    <label class="checkbox">
-      <input id="deleteBrowsingHistoryCheckbox"
-          pref="browser.clear_data.browsing_history" type="checkbox">
-      <span i18n-content="deleteBrowsingHistoryCheckbox"></span>
-    </label>
-    <label class="checkbox">
-      <input id="deleteDownloadHistoryCheckbox"
-          pref="browser.clear_data.download_history" type="checkbox">
-      <span i18n-content="deleteDownloadHistoryCheckbox"></span>
-    </label>
-    <label class="checkbox">
-      <input id="deleteCacheCheckbox"
-          pref="browser.clear_data.cache" type="checkbox">
-      <span i18n-content="deleteCacheCheckbox"></span>
-    </label>
-    <label class="checkbox">
-      <input id="deleteCookiesCheckbox"
-          pref="browser.clear_data.cookies" type="checkbox">
-      <span id="deleteCookiesLabel"></span>
-    </label>
-    <label class="checkbox">
-      <input id="deletePasswordsCheckbox"
-          pref="browser.clear_data.passwords" type="checkbox">
-      <span i18n-content="deletePasswordsCheckbox"></span>
-    </label>
-    <label class="checkbox">
-      <input id="deleteFormDataCheckbox"
-          pref="browser.clear_data.form_data" type="checkbox">
-      <span i18n-content="deleteFormDataCheckbox"></span>
-    </label>
+    <div id="clear-data-checkboxes">
+      <label class="checkbox">
+        <input id="deleteBrowsingHistoryCheckbox"
+            pref="browser.clear_data.browsing_history" type="checkbox">
+        <span i18n-content="deleteBrowsingHistoryCheckbox"></span>
+      </label>
+      <label class="checkbox">
+        <input id="deleteDownloadHistoryCheckbox"
+            pref="browser.clear_data.download_history" type="checkbox">
+        <span i18n-content="deleteDownloadHistoryCheckbox"></span>
+      </label>
+      <label class="checkbox">
+        <input id="deleteCacheCheckbox"
+            pref="browser.clear_data.cache" type="checkbox">
+        <span i18n-content="deleteCacheCheckbox"></span>
+      </label>
+      <label class="checkbox">
+        <input id="deleteCookiesCheckbox"
+            pref="browser.clear_data.cookies" type="checkbox">
+        <span id="deleteCookiesLabel"></span>
+      </label>
+      <label class="checkbox">
+        <input id="deletePasswordsCheckbox"
+            pref="browser.clear_data.passwords" type="checkbox">
+        <span i18n-content="deletePasswordsCheckbox"></span>
+      </label>
+      <label class="checkbox">
+        <input id="deleteFormDataCheckbox"
+            pref="browser.clear_data.form_data" type="checkbox">
+        <span i18n-content="deleteFormDataCheckbox"></span>
+      </label>
+    </div>
   </div>
   <div class="action-area">
     <div>
diff --git a/chrome/browser/resources/options/cookies_view.css b/chrome/browser/resources/options/cookies_view.css
index 1fb0f12..3efe4e7 100644
--- a/chrome/browser/resources/options/cookies_view.css
+++ b/chrome/browser/resources/options/cookies_view.css
@@ -32,7 +32,6 @@ html[dir=ltr] .cookie-details-label {
 
 #cookiesTree {
   border: 1px solid lightgrey;
-  height: 200px;
   margin: 0;
   padding: 5px;
 }
diff --git a/chrome/browser/resources/options/language_options.css b/chrome/browser/resources/options/language_options.css
index 810076f..f79fc5d 100644
--- a/chrome/browser/resources/options/language_options.css
+++ b/chrome/browser/resources/options/language_options.css
@@ -1,6 +1,6 @@
 .language-options {
   display: -webkit-box;
-  margin: 15px;
+  margin: 10px 0;
 }
 
 .language-options button {
@@ -25,7 +25,7 @@
 }
 
 .language-options-header, .language-options-footer {
-  margin: 15px;
+  margin: 10px 0;
 }
 
 .language-options-left, .language-options-right {
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index e7bec74..bb28065 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -521,7 +521,7 @@ html[dir=rtl].option-name {
   background-repeat: no-repeat;
 }
 
-input.favicon-cell {
+input[type="url"].favicon-cell {
   -webkit-padding-start: 22px;
   background-position-x: 4px;
 }
@@ -577,7 +577,8 @@ html[os=mac] input[type='submit']:focus {
 
 /* TEXT */
 input[type='password'],
-input[type='text'] {
+input[type='text'],
+input[type='url']{
   -webkit-border-radius: 2px;
   border: 1px solid #aaa;
   font-size: inherit;
diff --git a/chrome/browser/resources/options/personal_options.css b/chrome/browser/resources/options/personal_options.css
index af8bf83..74b65f2 100644
--- a/chrome/browser/resources/options/personal_options.css
+++ b/chrome/browser/resources/options/personal_options.css
@@ -14,6 +14,10 @@
   margin-right: 5px;
 }
 
+#themes-gallery-div {
+  margin: 10px 0;
+}
+
 .sync-error {
   background-color: #FF9A9A;
 }
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 2792c38..7e3a55e 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -85,8 +85,10 @@
         <button id="themes-reset"
             i18n-content="themesSetClassic"></button>
       </div>
-      <a id="themes-gallery" i18n-content="themesGallery"
-          i18n-values="href:themesGalleryURL" target="_blank"></a>
+      <div id="themes-gallery-div">
+        <a id="themes-gallery" i18n-content="themesGallery"
+            i18n-values="href:themesGalleryURL" target="_blank"></a>
+      </div>
       <label class="radio">
         <input name="decorations_radio"
             pref="browser.custom_chrome_frame"
@@ -109,8 +111,10 @@
       <div>
         <button id="themes-reset" i18n-content="themesReset"></button>
       </div>
-      <a id="themes-gallery" i18n-content="themesGallery"
-          i18n-values="href:themesGalleryURL" target="_blank"></a>
+      <div id="themes-gallery-div">
+        <a id="themes-gallery" i18n-content="themesGallery"
+            i18n-values="href:themesGalleryURL" target="_blank"></a>
+      </div>
     </div>
   </section>
 </if>
diff --git a/chrome/browser/resources/options/search_engine_manager.css b/chrome/browser/resources/options/search_engine_manager.css
index ed4fdf2..2568a0e 100644
--- a/chrome/browser/resources/options/search_engine_manager.css
+++ b/chrome/browser/resources/options/search_engine_manager.css
@@ -57,9 +57,11 @@
 }
 
 .search-engine-list .url-column button {
+  -webkit-margin-start: 3px;
+  -webkit-margin-end: 5px;
   background: #8aaaed;
   color: #fff;
-  -webkit-margin-start: 3px;
+  margin-top: 0;
 }
 
 .search-engine-list > :not(:hover):not([editing]) .url-column button {