Fix a bug in ImportingData Overlay which cause crash when importing data multiple times.

Fix the problem when force closing the tab while importing.

BUG=49095
TEST=None

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

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

2 files changed, 7 insertions, 2 deletions

diff --git a/chrome/browser/resources/options/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js
index 3bec1c2..455636b 100644
--- a/chrome/browser/resources/options/import_data_overlay.js
+++ b/chrome/browser/resources/options/import_data_overlay.js
@@ -109,6 +109,10 @@ cr.define('options', function() {
     },
   };
 
+  ImportDataOverlay.loadImporter = function() {
+    chrome.send('loadImporter');
+  };
+
   ImportDataOverlay.updateSupportedBrowsers = function(browsers) {
     ImportDataOverlay.getInstance().updateSupportedBrowsers_(browsers);
   };
@@ -141,8 +145,8 @@ cr.define('options', function() {
   };
 
   ImportDataOverlay.dismiss = function() {
-    OptionsPage.clearOverlays();
     ImportDataOverlay.setImportingState(false);
+    OptionsPage.clearOverlays();
   }
 
   // Export
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index d335f9a..a1fa4de 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -68,7 +68,8 @@ cr.define('options', function() {
           OptionsPage.showOverlay('stopSyncingOverlay');
         };
         $('import_data').onclick = function(event) {
-            OptionsPage.showOverlay('importDataOverlay');
+          ImportDataOverlay.loadImporter();
+          OptionsPage.showOverlay('importDataOverlay');
         };
       }