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

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

Issue 1730893002: Revert of Remove DialogDelegate::OnClosed() which is redundant with (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | ash/system/chromeos/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17 matching lines...) Expand all
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 // views::DialogDelegateView: 33 // views::DialogDelegateView:
34 bool Accept() override; 34 bool Accept() override;
35 ui::ModalType GetModalType() const override; 35 ui::ModalType GetModalType() const override;
36 base::string16 GetWindowTitle() const override; 36 base::string16 GetWindowTitle() const override;
37 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; 37 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
38 void WindowClosing() override; 38 void OnClosed() override;
39 void DeleteDelegate() override;
39 40
40 private: 41 private:
41 void UpdateLabel(); 42 void UpdateLabel();
42 43
43 LogoutConfirmationController* controller_; 44 LogoutConfirmationController* controller_;
44 base::TimeTicks logout_time_; 45 base::TimeTicks logout_time_;
45 46
46 views::Label* label_; 47 views::Label* label_;
47 48
48 base::RepeatingTimer update_timer_; 49 base::RepeatingTimer update_timer_;
49 50
50 DISALLOW_COPY_AND_ASSIGN(LogoutConfirmationDialog); 51 DISALLOW_COPY_AND_ASSIGN(LogoutConfirmationDialog);
51 }; 52 };
52 53
53 } // namespace ash 54 } // namespace ash
54 55
55 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_ 56 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_CONFIRMATION_DIALOG_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/chromeos/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698