Make the import feature a little more complete:

- Now we show import progress of individual items
- In case Firefox is running we display a warning and allow user to close it before proceeding
- Delete the Firefox lock when import finishes

BUG=11191

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


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

1 files changed, 12 insertions, 3 deletions

diff --git a/chrome/browser/gtk/import_dialog_gtk.h b/chrome/browser/gtk/import_dialog_gtk.h
index 351aed6..f3d4f03 100644
--- a/chrome/browser/gtk/import_dialog_gtk.h
+++ b/chrome/browser/gtk/import_dialog_gtk.h
@@ -7,14 +7,17 @@
 
 #include "chrome/browser/importer/importer.h"
 
-class Profile;
-typedef struct _GtkWindow GtkWindow;
+#include "chrome/browser/profile.h"
 
-class ImportDialogGtk {
+class ImportDialogGtk : public ImportObserver {
  public:
   // Displays the import box to import data from another browser into |profile|
   static void Show(GtkWindow* parent, Profile* profile);
 
+  // Overridden from ImportObserver:
+  virtual void ImportCanceled();
+  virtual void ImportComplete();
+
  private:
   ImportDialogGtk(GtkWindow* parent, Profile* profile);
   ~ImportDialogGtk() { }
@@ -26,6 +29,12 @@ class ImportDialogGtk {
   }
   void OnDialogResponse(GtkWidget* widget, int response);
 
+  // Parent window
+  GtkWindow* parent_;
+
+  // Import Dialog
+  GtkWidget* dialog_;
+
   // Combo box that displays list of profiles from which we can import.
   GtkWidget* combo_;