add throbber, remove radio

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

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

6 files changed, 18 insertions, 24 deletions

diff --git a/chrome/browser/dom_ui/personal_options_handler.cc b/chrome/browser/dom_ui/personal_options_handler.cc
index 444c8d1..a1e6e44 100644
--- a/chrome/browser/dom_ui/personal_options_handler.cc
+++ b/chrome/browser/dom_ui/personal_options_handler.cc
@@ -57,10 +57,6 @@ void PersonalOptionsHandler::GetLocalizedValues(
 
   localized_strings->SetString(L"autofill",
       l10n_util::GetString(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME));
-  localized_strings->SetString(L"autofill_enable",
-      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_ENABLE));
-  localized_strings->SetString(L"autofill_disable",
-      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_DISABLE));
   localized_strings->SetString(L"autofill_options",
       l10n_util::GetString(IDS_AUTOFILL_OPTIONS));
 
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index c359cbb..020c23e 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -142,6 +142,7 @@ window.onpopstate = function(e) {
 <link rel="stylesheet" href="options/content_settings_page.css">
 <link rel="stylesheet" href="options/content_settings_exceptions_area.css">
 <link rel="stylesheet" href="options/clear_browser_data_overlay.css">
+<link rel="stylesheet" href="options/import_data_overlay.css">
 <if expr="pp_ifdef('chromeos')">
   <link rel="stylesheet" href="options/chromeos_accounts_options_page.css">
   <link rel="stylesheet" href="options/chromeos_internet_options_page.css">
diff --git a/chrome/browser/resources/options/import_data_overlay.css b/chrome/browser/resources/options/import_data_overlay.css
new file mode 100644
index 0000000..f49ee22
--- /dev/null
+++ b/chrome/browser/resources/options/import_data_overlay.css
@@ -0,0 +1,8 @@
+#import-throbber {
+  background-image: url("../../../../app/resources/throbber.png");
+  width: 16px;
+  height: 16px;
+  margin: -3px 10px;
+  display: inline-block;
+  visibility: hidden;
+}
diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html
index 5bab568..4b65410 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -23,8 +23,8 @@
       <span i18n-content="import_history">
     </label><br>
   </div>
-  <span id="import-throbber"></span>
   <button id="import-data-cancel" i18n-content="cancel"
     onclick="ImportDataOverlay.dismiss();"></button>
   <button id="import-data-commit" i18n-content="import_commit"></button>
+  <span id="import-throbber"></span>
 </div>
diff --git a/chrome/browser/resources/options/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js
index 784b831..66eb594 100644
--- a/chrome/browser/resources/options/import_data_overlay.js
+++ b/chrome/browser/resources/options/import_data_overlay.js
@@ -92,7 +92,7 @@ cr.define('options', function() {
         var option = new Option(templateData.no_profile_found, 0);
         browserSelect.appendChild(option);
 
-        ImportDataOverlay.setImportingState(true);
+        ImportDataOverlay.setDisable(true);
       }
       else {
         for (var i = 0; i < browserCount; i++) {
@@ -100,7 +100,7 @@ cr.define('options', function() {
           var option = new Option(browser['name'], browser['index']);
           browserSelect.appendChild(option);
 
-        ImportDataOverlay.setImportingState(false);
+        ImportDataOverlay.setDisable(false);
         this.countCheckboxes_();
         }
       }
@@ -111,13 +111,17 @@ cr.define('options', function() {
     ImportDataOverlay.getInstance().updateSupportedBrowsers_(browsers);
   }
 
-  ImportDataOverlay.setImportingState = function(state) {
+  ImportDataOverlay.setDisable = function(state) {
     $('supported-browsers').disabled = state;
     $('import-favorites').disabled = state;
     $('import-search').disabled = state;
     $('import-passwords').disabled = state;
     $('import-history').disabled = state;
     $('import-data-commit').disabled = state;
+  }
+
+  ImportDataOverlay.setImportingState = function(state) {
+    ImportDataOverlay.setDisable(state);
     $('import-throbber').style.visibility = state ? "visible" : "hidden";
 
     function advanceThrobber() {
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 9f907c3..2b3bae2 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -44,22 +44,7 @@
   <section>
     <h3 i18n-content="autofill"></h3>
     <div>
-      <label>
-        <input id="autofill_enable"
-            name="autofill_radio"
-            pref="autofill.enabled"
-            type="radio" value="true">
-        <span i18n-content="autofill_enable"></span>
-      </label>
-      <label>
-        <input id="autofill_disable"
-            name="autofill_radio"
-            pref="autofill.enabled"
-            type="radio" value="false">
-        <span i18n-content="autofill_disable"></span>
-      </label>
-      <div><button id="autofill_options"
-          i18n-content="autofill_options"></button></div>
+      <button id="autofill_options" i18n-content="autofill_options"></button>
     </div>
   </section>
   <section>