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

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

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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_BUTTON_TRAY_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_
6 #define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_ 6 #define ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/chromeos/session/logout_button_observer.h" 9 #include "ash/system/chromeos/session/logout_button_observer.h"
10 #include "ash/system/tray/tray_background_view.h" 10 #include "ash/system/tray/tray_background_view.h"
(...skipping 10 matching lines...) Expand all
21 namespace ash { 21 namespace ash {
22 class StatusAreaWidget; 22 class StatusAreaWidget;
23 23
24 // Adds a logout button to the launcher's status area if enabled by the 24 // Adds a logout button to the launcher's status area if enabled by the
25 // kShowLogoutButtonInTray pref. 25 // kShowLogoutButtonInTray pref.
26 class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView, 26 class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView,
27 public LogoutButtonObserver, 27 public LogoutButtonObserver,
28 public views::ButtonListener { 28 public views::ButtonListener {
29 public: 29 public:
30 explicit LogoutButtonTray(StatusAreaWidget* status_area_widget); 30 explicit LogoutButtonTray(StatusAreaWidget* status_area_widget);
31 virtual ~LogoutButtonTray(); 31 ~LogoutButtonTray() override;
32 32
33 // TrayBackgroundView: 33 // TrayBackgroundView:
34 virtual void SetShelfAlignment(ShelfAlignment alignment) override; 34 void SetShelfAlignment(ShelfAlignment alignment) override;
35 virtual base::string16 GetAccessibleNameForTray() override; 35 base::string16 GetAccessibleNameForTray() override;
36 virtual void HideBubbleWithView( 36 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
37 const views::TrayBubbleView* bubble_view) override; 37 bool ClickedOutsideBubble() override;
38 virtual bool ClickedOutsideBubble() override;
39 38
40 // LogoutButtonObserver: 39 // LogoutButtonObserver:
41 virtual void OnShowLogoutButtonInTrayChanged(bool show) override; 40 void OnShowLogoutButtonInTrayChanged(bool show) override;
42 virtual void OnLogoutDialogDurationChanged(base::TimeDelta duration) override; 41 void OnLogoutDialogDurationChanged(base::TimeDelta duration) override;
43 42
44 // views::ButtonListener: 43 // views::ButtonListener:
45 virtual void ButtonPressed(views::Button* sender, 44 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
46 const ui::Event& event) override;
47 45
48 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 46 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
49 47
50 private: 48 private:
51 void UpdateVisibility(); 49 void UpdateVisibility();
52 50
53 views::LabelButton* button_; 51 views::LabelButton* button_;
54 user::LoginStatus login_status_; 52 user::LoginStatus login_status_;
55 bool show_logout_button_in_tray_; 53 bool show_logout_button_in_tray_;
56 base::TimeDelta dialog_duration_; 54 base::TimeDelta dialog_duration_;
57 55
58 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray); 56 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);
59 }; 57 };
60 58
61 } // namespace ash 59 } // namespace ash
62 60
63 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_ 61 #endif // ASH_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/session/last_window_closed_logout_reminder.h ('k') | ash/system/chromeos/session/logout_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698