Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2706)

Unified Diff: chrome/browser/ui/views/importer/import_progress_dialog_view.cc

Issue 9702103: Clean up first run: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/importer/import_progress_dialog_view.cc
===================================================================
--- chrome/browser/ui/views/importer/import_progress_dialog_view.cc (revision 127058)
+++ chrome/browser/ui/views/importer/import_progress_dialog_view.cc (working copy)
@@ -19,7 +19,6 @@
#include "ui/views/widget/widget.h"
ImportProgressDialogView::ImportProgressDialogView(
- HWND parent_window,
uint16 items,
ImporterHost* importer_host,
ImporterObserver* importer_observer,
@@ -40,7 +39,6 @@
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),
@@ -120,10 +118,6 @@
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);
}
@@ -281,8 +275,7 @@
namespace importer {
-void ShowImportProgressDialog(HWND parent_window,
- uint16 items,
+void ShowImportProgressDialog(uint16 items,
ImporterHost* importer_host,
ImporterObserver* importer_observer,
const SourceProfile& source_profile,
@@ -290,22 +283,19 @@
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
« no previous file with comments | « chrome/browser/ui/views/importer/import_progress_dialog_view.h ('k') | chrome/browser/ui/views/stubs_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698