diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 18:10:26 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 18:10:26 +0000 |
| commit | 47b9b6f198e8c7a10dffe369875d47f7ceb46f7a (patch) | |
| tree | 5d8b1294ec34a4010ff285a4c3306b6b15c3b181 /chrome/browser/gtk/first_run_dialog.cc | |
| parent | e83ecf6f9b7b0111a20ff2173435b8fbafe35d99 (diff) | |
| download | chromium_src-47b9b6f198e8c7a10dffe369875d47f7ceb46f7a.zip chromium_src-47b9b6f198e8c7a10dffe369875d47f7ceb46f7a.tar.gz chromium_src-47b9b6f198e8c7a10dffe369875d47f7ceb46f7a.tar.bz2 | |
Need to cleanup first run dialog on cancellation too.
Fixing what r20898 broke.
Review URL: http://codereview.chromium.org/155676
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/first_run_dialog.cc')
| -rw-r--r-- | chrome/browser/gtk/first_run_dialog.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/gtk/first_run_dialog.cc b/chrome/browser/gtk/first_run_dialog.cc index 1ada23b..210f56a 100644 --- a/chrome/browser/gtk/first_run_dialog.cc +++ b/chrome/browser/gtk/first_run_dialog.cc @@ -123,6 +123,7 @@ FirstRunDialog::FirstRunDialog(Profile* profile, int& response) } void FirstRunDialog::OnDialogResponse(GtkWidget* widget, int response) { + bool import_started = false; gtk_widget_hide_all(dialog_); response_ = response; @@ -159,11 +160,11 @@ void FirstRunDialog::OnDialogResponse(GtkWidget* widget, int response) { // Windows? StartImportingWithUI(GTK_WINDOW(dialog_), items, importer_host_.get(), source_profile, profile_, this, true); - } else { - // We are done, so close Window. - FirstRunDone(); + import_started = true; } } + if (!import_started) + FirstRunDone(); } void FirstRunDialog::FirstRunDone() { |