Reland "Add option to import from bookmarks html file to ...""

chrome/browser/resources/options/import_data_overlay.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
 
   /**
    * ImportDataOverlay class
    * Encapsulated handling of the 'Import Data' overlay page.
@@ skipping 40 matching lines @@
             String($('import-history').checked),
             String($('import-favorites').checked),
             String($('import-passwords').checked),
             String($('import-search').checked)]);
       };
 
       $('import-data-cancel').onclick = function() {
         ImportDataOverlay.dismiss();
       };
 
+      $('import-choose-file').onclick = function() {
+        chrome.send('chooseBookmarksFile');
+      };
+
       $('import-data-show-bookmarks-bar').onchange = function() {
         // Note: The callback 'toggleShowBookmarksBar' is handled within the
         // browser options handler -- rather than the import data handler --
         // as the implementation is shared by several clients.
         chrome.send('toggleShowBookmarksBar');
       }
 
       $('import-data-confirm').onclick = function() {
         ImportDataOverlay.dismiss();
       };
@@ skipping 39 matching lines @@
       checkbox.setDisabled('noProfileData', !enabled);
       checkbox.checked = enabled;
     },
 
     /**
      * Update the enabled and checked states of all checkboxes.
      * @private
      */
     updateCheckboxes_: function() {
       var index = $('import-browsers').selectedIndex;
+      var bookmarksFileSelected = index == this.browserProfiles.length - 1;
+      $('import-choose-file').hidden = !bookmarksFileSelected;
+      $('import-data-commit').hidden = bookmarksFileSelected;
+
       var browserProfile;
       if (this.browserProfiles.length > index)
         browserProfile = this.browserProfiles[index];
       var importOptions = ['history', 'favorites', 'passwords', 'search'];
       for (var i = 0; i < importOptions.length; i++) {
         var checkbox = $('import-' + importOptions[i]);
         var enable = browserProfile && browserProfile[importOptions[i]];
+        checkbox.checked = enable;
         this.setUpCheckboxState_(checkbox, enable);
         var checkboxWithLabel = $('import-' + importOptions[i] + '-with-label');
         checkboxWithLabel.style.display = enable ? '' : 'none';
       }
     },
 
     /**
      * Show or hide gray message at the bottom.
      * @private
      */
@@ skipping 124 matching lines @@
     ImportDataOverlay.getInstance().validateCommitButton_();
 
     OptionsPage.navigateToPage('importData');
   };
 
   // Export
   return {
     ImportDataOverlay: ImportDataOverlay
   };
 });