Add import progress indicator dialog.

chrome/browser/gtk/import_dialog_gtk.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/gtk/import_dialog_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
 
 // static
 void ImportDialogGtk::Show(GtkWindow* parent, Profile* profile) {
   new ImportDialogGtk(parent, profile);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// ImportObserver implementation:
+void ImportDialogGtk::ImportCanceled() {
+  ImportComplete();
+}
+
+void ImportDialogGtk::ImportComplete() {
+  gtk_widget_destroy(dialog_);
+  delete this;
+}
+
 ImportDialogGtk::ImportDialogGtk(GtkWindow* parent, Profile* profile) :
-    profile_(profile), importer_host_(new ImporterHost()) {
+    parent_(parent), profile_(profile), importer_host_(new ImporterHost()) {
   // Build the dialog.
-  GtkWidget* dialog = gtk_dialog_new_with_buttons(
+  dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_IMPORT_SETTINGS_TITLE).c_str(),
       parent,
       (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
       GTK_STOCK_CANCEL,
       GTK_RESPONSE_REJECT,
       l10n_util::GetStringUTF8(IDS_IMPORT_COMMIT).c_str(),
       GTK_RESPONSE_ACCEPT,
       NULL);
 
   // TODO(rahulk): find how to set size properly so that the dialog
   // box width is at least enough to display full title.
-  gtk_widget_set_size_request(dialog, 300, -1);
+  gtk_widget_set_size_request(dialog_, 300, -1);
 
-  GtkWidget* content_area = GTK_DIALOG(dialog)->vbox;
+  GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox;
   gtk_box_set_spacing(GTK_BOX(content_area), 18);
 
   GtkWidget* combo_hbox = gtk_hbox_new(FALSE, 12);
   GtkWidget* from = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_LABEL).c_str());
   gtk_box_pack_start(GTK_BOX(combo_hbox), from, FALSE, FALSE, 0);
 
   combo_ = gtk_combo_box_new_text();
   int profiles_count = importer_host_->GetAvailableProfileCount();
   for (int i = 0; i < profiles_count; i++) {
@@ skipping 23 matching lines @@
 
   passwords_ = gtk_check_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_IMPORT_PASSWORDS_CHKBOX).c_str());
   gtk_box_pack_start(GTK_BOX(vbox), passwords_, FALSE, FALSE, 0);
 
   history_ = gtk_check_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_IMPORT_HISTORY_CHKBOX).c_str());
   gtk_box_pack_start(GTK_BOX(vbox), history_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
 
-  g_signal_connect(dialog, "response",
+  g_signal_connect(dialog_, "response",
                    G_CALLBACK(HandleOnResponseDialog), this);
-  gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-  gtk_widget_show_all(dialog);
+  gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE);
+  gtk_widget_show_all(dialog_);
 }
 
 void ImportDialogGtk::OnDialogResponse(GtkWidget* widget, int response) {
+  gtk_widget_hide_all(dialog_);
   if (response == GTK_RESPONSE_ACCEPT) {
     uint16 items = NONE;
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(bookmarks_)))
       items |= FAVORITES;
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search_engines_)))
       items |= SEARCH_ENGINES;
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(passwords_)))
       items |= PASSWORDS;
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(history_)))
       items |= HISTORY;
 
     const ProfileInfo& source_profile = importer_host_->GetSourceProfileInfoAt(
         gtk_combo_box_get_active(GTK_COMBO_BOX(combo_)));
-
-    // TODO(rahulk): We should not do the import on this thread. Instead
-    // we need to start this asynchronously and launch a UI that shows the
-    // progress of import.
-    importer_host_->StartImportSettings(source_profile, profile_, items,
-                                        new ProfileWriter(profile_), false);
+    StartImportingWithUI(parent_, items, importer_host_.get(),
+                         source_profile, profile_, this, false);
+  } else {
+    ImportCanceled();
   }
-
-  delete this;
-  gtk_widget_destroy(GTK_WIDGET(widget));
 }