| 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 f5ec1fd70191656989f659f62a70d1de2fc13579..5e635f491aeb19e882c99d35a33fc756116e1513 100644
|
| --- a/chrome/browser/chromeos/enrollment_dialog_view.cc
|
| +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
|
| @@ -53,12 +53,12 @@
|
| // 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,6 +120,17 @@
|
| 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(¶ms);
|
| +}
|
| +
|
| base::string16 EnrollmentDialogView::GetDialogButtonLabel(
|
| ui::DialogButton button) const {
|
| if (button == ui::DIALOG_BUTTON_OK)
|
| @@ -133,16 +144,6 @@
|
|
|
| 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(¶ms);
|
| }
|
|
|
| gfx::Size EnrollmentDialogView::GetPreferredSize() const {
|
|
|