diff options
author | estade <estade@chromium.org> | 2016-02-23 11:42:56 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-23 19:44:33 +0000 |
commit | 6f69f42209045c9d0c8b6bfc44d83ca6eca70a74 (patch) | |
tree | ac6de7326cc6ab58bb29eff5e069f5176cd872b6 /ash | |
parent | 03984daf8c4dee23e8749d91cdb02b2bc685c9d9 (diff) | |
download | chromium_src-6f69f42209045c9d0c8b6bfc44d83ca6eca70a74.zip chromium_src-6f69f42209045c9d0c8b6bfc44d83ca6eca70a74.tar.gz chromium_src-6f69f42209045c9d0c8b6bfc44d83ca6eca70a74.tar.bz2 |
Remove DialogDelegate::OnClosed() which is redundant with
WidgetDelegate::WindowClosing().
BUG=585312, 583330
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/1686433002
Cr-Commit-Position: refs/heads/master@{#377057}
Diffstat (limited to 'ash')
-rw-r--r-- | ash/system/chromeos/session/logout_confirmation_dialog.cc | 6 | ||||
-rw-r--r-- | ash/system/chromeos/session/logout_confirmation_dialog.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ash/system/chromeos/session/logout_confirmation_dialog.cc b/ash/system/chromeos/session/logout_confirmation_dialog.cc index 80a71e8..89c73b0 100644 --- a/ash/system/chromeos/session/logout_confirmation_dialog.cc +++ b/ash/system/chromeos/session/logout_confirmation_dialog.cc @@ -84,15 +84,11 @@ base::string16 LogoutConfirmationDialog::GetDialogButtonLabel( return views::DialogDelegateView::GetDialogButtonLabel(button); } -void LogoutConfirmationDialog::OnClosed() { +void LogoutConfirmationDialog::WindowClosing() { update_timer_.Stop(); controller_->OnDialogClosed(); } -void LogoutConfirmationDialog::DeleteDelegate() { - delete this; -} - void LogoutConfirmationDialog::UpdateLabel() { const base::TimeDelta time_remaining = logout_time_ - controller_->clock()->NowTicks(); diff --git a/ash/system/chromeos/session/logout_confirmation_dialog.h b/ash/system/chromeos/session/logout_confirmation_dialog.h index 61407b1..4e3d19f4 100644 --- a/ash/system/chromeos/session/logout_confirmation_dialog.h +++ b/ash/system/chromeos/session/logout_confirmation_dialog.h @@ -35,8 +35,7 @@ class LogoutConfirmationDialog : public views::DialogDelegateView { ui::ModalType GetModalType() const override; base::string16 GetWindowTitle() const override; base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; - void OnClosed() override; - void DeleteDelegate() override; + void WindowClosing() override; private: void UpdateLabel(); |