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

Side by Side Diff: ash/system/chromeos/session/logout_confirmation_dialog.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_
6 #define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_ 6 #define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 12 matching lines...) Expand all
23 // countdown and informs the user that a logout will happen automatically if no 23 // countdown and informs the user that a logout will happen automatically if no
24 // choice is made before the countdown has expired. 24 // choice is made before the countdown has expired.
25 class LogoutConfirmationDialog : public views::DialogDelegateView { 25 class LogoutConfirmationDialog : public views::DialogDelegateView {
26 public: 26 public:
27 LogoutConfirmationDialog(LogoutConfirmationController* controller, 27 LogoutConfirmationDialog(LogoutConfirmationController* controller,
28 base::TimeTicks logout_time); 28 base::TimeTicks logout_time);
29 ~LogoutConfirmationDialog() override; 29 ~LogoutConfirmationDialog() override;
30 30
31 void Update(base::TimeTicks logout_time); 31 void Update(base::TimeTicks logout_time);
32 32
33 // Called when |controller_| is no longer valid.
34 void ControllerGone();
35
33 // views::DialogDelegateView: 36 // views::DialogDelegateView:
34 bool Accept() override; 37 bool Accept() override;
35 ui::ModalType GetModalType() const override; 38 ui::ModalType GetModalType() const override;
36 base::string16 GetWindowTitle() const override; 39 base::string16 GetWindowTitle() const override;
37 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; 40 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
38 void OnClosed() override; 41 void WindowClosing() override;
39 void DeleteDelegate() override;
40 42
41 private: 43 private:
42 void UpdateLabel(); 44 void UpdateLabel();
43 45
44 LogoutConfirmationController* controller_; 46 LogoutConfirmationController* controller_;
45 base::TimeTicks logout_time_; 47 base::TimeTicks logout_time_;
46 48
47 views::Label* label_; 49 views::Label* label_;
48 50
49 base::RepeatingTimer update_timer_; 51 base::RepeatingTimer update_timer_;
50 52
51 DISALLOW_COPY_AND_ASSIGN(LogoutConfirmationDialog); 53 DISALLOW_COPY_AND_ASSIGN(LogoutConfirmationDialog);
52 }; 54 };
53 55
54 } // namespace ash 56 } // namespace ash
55 57
56 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_ 58 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698