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

Unified Diff: chrome/browser/chromeos/enrollment_dialog_view.cc

Issue 1729723003: Reland: Remove DialogDelegate::OnClosed() which is redundant with (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with fix Created 4 years, 10 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/chromeos/enrollment_dialog_view.cc
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
index 5e635f491aeb19e882c99d35a33fc756116e1513..f5ec1fd70191656989f659f62a70d1de2fc13579 100644
--- a/chrome/browser/chromeos/enrollment_dialog_view.cc
+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -53,12 +53,12 @@ class EnrollmentDialogView : public views::DialogDelegateView {
// views::DialogDelegateView overrides
int GetDialogButtons() const override;
bool Accept() override;
- void OnClosed() override;
base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
// views::WidgetDelegate overrides
ui::ModalType GetModalType() const override;
base::string16 GetWindowTitle() const override;
+ void WindowClosing() override;
// views::View overrides
gfx::Size GetPreferredSize() const override;
@@ -120,17 +120,6 @@ bool EnrollmentDialogView::Accept() {
return true;
}
-void EnrollmentDialogView::OnClosed() {
- if (!accepted_)
- return;
- chrome::NavigateParams params(profile_,
- GURL(target_uri_),
- ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
- params.window_action = chrome::NavigateParams::SHOW_WINDOW;
- chrome::Navigate(&params);
-}
-
base::string16 EnrollmentDialogView::GetDialogButtonLabel(
ui::DialogButton button) const {
if (button == ui::DIALOG_BUTTON_OK)
@@ -146,6 +135,16 @@ base::string16 EnrollmentDialogView::GetWindowTitle() const {
return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_TITLE);
}
+void EnrollmentDialogView::WindowClosing() {
+ if (!accepted_)
+ return;
+ chrome::NavigateParams params(profile_, GURL(target_uri_),
+ ui::PAGE_TRANSITION_LINK);
+ params.disposition = NEW_FOREGROUND_TAB;
+ params.window_action = chrome::NavigateParams::SHOW_WINDOW;
+ chrome::Navigate(&params);
+}
+
gfx::Size EnrollmentDialogView::GetPreferredSize() const {
return gfx::Size(kDefaultWidth, kDefaultHeight);
}

Powered by Google App Engine
This is Rietveld 408576698