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

Side by Side Diff: ash/system/logout_button/logout_button_tray.h

Issue 40053002: Implements the dialog view for logout button tray in public sessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_ 5 #ifndef ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_
6 #define ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_ 6 #define ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h"
8 #include "ash/system/logout_button/logout_button_observer.h" 9 #include "ash/system/logout_button/logout_button_observer.h"
10 #include "ash/system/logout_button/logout_confirmation_dialog_view.h"
9 #include "ash/system/tray/tray_background_view.h" 11 #include "ash/system/tray/tray_background_view.h"
10 #include "ash/system/user/login_status.h" 12 #include "ash/system/user/login_status.h"
11 #include "base/basictypes.h" 13 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h"
13 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
14 18
15 namespace views { 19 namespace views {
16 class LabelButton; 20 class LabelButton;
17 } 21 }
18 22
19 namespace ash { 23 namespace ash {
20 namespace internal { 24 namespace internal {
21 25
22 class StatusAreaWidget; 26 class StatusAreaWidget;
23 27
24 // Adds a logout button to the launcher's status area if enabled by the 28 // Adds a logout button to the launcher's status area if enabled by the
25 // kShowLogoutButtonInTray pref. 29 // kShowLogoutButtonInTray pref.
26 class LogoutButtonTray : public TrayBackgroundView, 30 class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView,
27 public LogoutButtonObserver, 31 public LogoutButtonObserver,
28 public views::ButtonListener { 32 public views::ButtonListener {
29 public: 33 public:
30 explicit LogoutButtonTray(StatusAreaWidget* status_area_widget); 34 LogoutButtonTray(StatusAreaWidget* status_area_widget);
bartfab (slow) 2013/12/17 13:21:03 Nit: Style guide: Single-argument constructors mus
binjin 2013/12/17 14:58:08 Done.
31 virtual ~LogoutButtonTray(); 35 virtual ~LogoutButtonTray();
32 36
37 bool IsConfirmationDialogShowing() const;
38 void EnsureConfirmationDialogIsShowing();
39 void EnsureConfirmationDialogIsClosed();
40
33 // TrayBackgroundView: 41 // TrayBackgroundView:
34 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; 42 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
35 virtual base::string16 GetAccessibleNameForTray() OVERRIDE; 43 virtual base::string16 GetAccessibleNameForTray() OVERRIDE;
36 virtual void HideBubbleWithView( 44 virtual void HideBubbleWithView(
37 const views::TrayBubbleView* bubble_view) OVERRIDE; 45 const views::TrayBubbleView* bubble_view) OVERRIDE;
38 virtual bool ClickedOutsideBubble() OVERRIDE; 46 virtual bool ClickedOutsideBubble() OVERRIDE;
39 47
40 // LogoutButtonObserver: 48 // LogoutButtonObserver:
41 virtual void OnShowLogoutButtonInTrayChanged(bool show) OVERRIDE; 49 virtual void OnShowLogoutButtonInTrayChanged(bool show) OVERRIDE;
50 virtual void OnLogoutDialogDurationChanged(base::TimeDelta duration) OVERRIDE;
42 51
43 // views::ButtonListener: 52 // views::ButtonListener:
44 virtual void ButtonPressed(views::Button* sender, 53 virtual void ButtonPressed(views::Button* sender,
45 const ui::Event& event) OVERRIDE; 54 const ui::Event& event) OVERRIDE;
46 55
47 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 56 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
48 57
58 void ReleaseConfirmationDialog();
59
60 LogoutConfirmationDialogView* GetConfirmationDialogForTest();
61 LogoutConfirmationDialogView::Delegate* GetConfirmationDelegateForTest();
62 void SetDelegateForTest(
63 scoped_ptr<LogoutConfirmationDialogView::Delegate> delegate);
64
49 private: 65 private:
66 friend class LogoutConfirmationDialogTest;
67
50 void UpdateVisibility(); 68 void UpdateVisibility();
51 69
52 views::LabelButton* button_; // Not owned. 70 views::LabelButton* button_; // Not owned.
53 user::LoginStatus login_status_; 71 user::LoginStatus login_status_;
54 bool show_logout_button_in_tray_; 72 bool show_logout_button_in_tray_;
73 base::TimeDelta dialog_duration_;
74
75 scoped_ptr<LogoutConfirmationDialogView> confirmation_dialog_;
76 scoped_ptr<LogoutConfirmationDialogView::Delegate> confirmation_delegate_;
55 77
56 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray); 78 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);
57 }; 79 };
58 80
59 } // namespace internal 81 } // namespace internal
60 } // namespace ash 82 } // namespace ash
61 83
62 #endif // ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_ 84 #endif // ASH_SYSTEM_LOGOUT_BUTTON_LOGOUT_BUTTON_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698