Clean up first run:

chrome/browser/ui/views/importer/import_progress_dialog_view.cc

 // Copyright (c) 2012 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/ui/views/importer/import_progress_dialog_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_observer.h"
 #include "chrome/browser/importer/importer_progress_dialog.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 ImportProgressDialogView::ImportProgressDialogView(
-    HWND parent_window,
     uint16 items,
     ImporterHost* importer_host,
     ImporterObserver* importer_observer,
     const string16& importer_name,
     bool bookmarks_import)
     : state_bookmarks_(new views::CheckmarkThrobber),
       state_searches_(new views::CheckmarkThrobber),
       state_passwords_(new views::CheckmarkThrobber),
       state_history_(new views::CheckmarkThrobber),
       state_cookies_(new views::CheckmarkThrobber),
       label_bookmarks_(new views::Label(
           l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS))),
       label_searches_(new views::Label(
           l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_SEARCH))),
       label_passwords_(new views::Label(
           l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_PASSWORDS))),
       label_history_(new views::Label(
           l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_HISTORY))),
       label_cookies_(new views::Label(
           l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_COOKIES))),
-      parent_window_(parent_window),
       items_(items),
       importer_host_(importer_host),
       importer_observer_(importer_observer),
       importing_(true),
       bookmarks_import_(bookmarks_import) {
   std::wstring info_text = bookmarks_import ?
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_BOOKMARKS)) :
       UTF16ToWide(l10n_util::GetStringFUTF16(
           IDS_IMPORT_PROGRESS_INFO, importer_name));
   label_info_ = new views::Label(info_text);
@@ skipping 59 matching lines @@
 int ImportProgressDialogView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
 
 string16 ImportProgressDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   DCHECK_EQ(button, ui::DIALOG_BUTTON_CANCEL);
   return l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_CANCEL);
 }
 
-ui::ModalType ImportProgressDialogView::GetModalType() const {
-  return parent_window_ ? ui::MODAL_TYPE_WINDOW : ui::MODAL_TYPE_NONE;
-}
-
 string16 ImportProgressDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_TITLE);
 }
 
 bool ImportProgressDialogView::Cancel() {
   // When the user cancels the import, we need to tell the importer_host to stop
   // importing and return false so that the window lives long enough to receive
   // ImportEnded, which will close the window. Closing the window results in
   // another call to this function and at that point we must return true to
   // allow the window to close.
@@ skipping 137 matching lines @@
   // In every case, we need to close the UI now.
   importing_ = false;
   importer_host_->SetObserver(NULL);
   GetWidget()->Close();
   if (importer_observer_)
     importer_observer_->ImportCompleted();
 }
 
 namespace importer {
 
-void ShowImportProgressDialog(HWND parent_window,
-                              uint16 items,
+void ShowImportProgressDialog(uint16 items,
                               ImporterHost* importer_host,
                               ImporterObserver* importer_observer,
                               const SourceProfile& source_profile,
                               Profile* target_profile,
                               bool first_run) {
   DCHECK_NE(items, 0u);
   ImportProgressDialogView* progress_view = new ImportProgressDialogView(
-      parent_window,
       items,
       importer_host,
       importer_observer,
       source_profile.importer_name,
       source_profile.importer_type == importer::TYPE_BOOKMARKS_FILE);
 
-  views::Widget* window =
-      views::Widget::CreateWindowWithParent(progress_view, parent_window);
+  views::Widget* window = views::Widget::CreateWindow(progress_view);
 
   if (!importer_host->is_headless() && !first_run)
     window->Show();
 
-  importer_host->StartImportSettings(
-      source_profile, target_profile, items, new ProfileWriter(target_profile),
-      first_run);
+  importer_host->StartImportSettings(source_profile, target_profile, items,
+      new ProfileWriter(target_profile), first_run);
 }
 
 }  // namespace importer