Importer: Fix ImporterList::DetectSourceProfiles to run on the FILE thread, as

it access the file system.  Fix up a few call sites.

BUG=60825
TEST=none

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

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

1 files changed, 13 insertions, 2 deletions

diff --git a/chrome/browser/gtk/import_dialog_gtk.h b/chrome/browser/gtk/import_dialog_gtk.h
index a1126b8..f52b845 100644
--- a/chrome/browser/gtk/import_dialog_gtk.h
+++ b/chrome/browser/gtk/import_dialog_gtk.h
@@ -12,14 +12,15 @@
 class AccessibleWidgetHelper;
 class Profile;
 
-class ImportDialogGtk : public ImportObserver {
+class ImportDialogGtk : public ImportObserver,
+                        public ImporterList::Observer {
  public:
   // Displays the import box to import data from another browser into |profile|
   // |initial_state| is a bitmask of ImportItems. Each checkbox for the bits in
   // is checked.
   static void Show(GtkWindow* parent, Profile* profile, int initial_state);
 
-  // Overridden from ImportObserver:
+  // ImportObserver implementation.
   virtual void ImportCanceled();
   virtual void ImportComplete();
 
@@ -27,6 +28,9 @@ class ImportDialogGtk : public ImportObserver {
   ImportDialogGtk(GtkWindow* parent, Profile* profile, int initial_state);
   ~ImportDialogGtk();
 
+  // ImporterList::Observer implementation.
+  virtual void SourceProfilesLoaded();
+
   // Handler to respond to OK or Cancel responses from the dialog.
   CHROMEGTK_CALLBACK_1(ImportDialogGtk, void, OnDialogResponse, int);
 
@@ -37,6 +41,10 @@ class ImportDialogGtk : public ImportObserver {
   // checkboxes.
   void UpdateDialogButtons();
 
+  // Sets the sensitivity of all controls on the dialog except the cancel
+  // button.
+  void SetDialogControlsSensitive(bool sensitive);
+
   // Create a bitmask from the checkboxes of the dialog.
   uint16 GetCheckedItems();
 
@@ -61,6 +69,9 @@ class ImportDialogGtk : public ImportObserver {
   // History checkbox
   GtkWidget* history_;
 
+  // Import button.
+  GtkWidget* import_button_;
+
   // Our current profile
   Profile* profile_;