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

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

Issue 2218323002: Better CrOS logout button for vertical trays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: without debug code Created 4 years, 4 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_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/login_status.h" 9 #include "ash/common/login_status.h"
10 #include "ash/common/system/chromeos/session/logout_button_observer.h" 10 #include "ash/common/system/chromeos/session/logout_button_observer.h"
(...skipping 27 matching lines...) Expand all
38 void OnShowLogoutButtonInTrayChanged(bool show) override; 38 void OnShowLogoutButtonInTrayChanged(bool show) override;
39 void OnLogoutDialogDurationChanged(base::TimeDelta duration) override; 39 void OnLogoutDialogDurationChanged(base::TimeDelta duration) override;
40 40
41 // views::ButtonListener: 41 // views::ButtonListener:
42 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 42 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
43 43
44 void UpdateAfterLoginStatusChange(LoginStatus login_status); 44 void UpdateAfterLoginStatusChange(LoginStatus login_status);
45 45
46 private: 46 private:
47 void UpdateVisibility(); 47 void UpdateVisibility();
48 void UpdateButtonTextAndImage(LoginStatus login_status,
49 ShelfAlignment alignment);
48 50
49 views::LabelButton* button_; 51 views::LabelButton* button_;
50 LoginStatus login_status_; 52 LoginStatus login_status_;
51 bool show_logout_button_in_tray_; 53 bool show_logout_button_in_tray_;
52 base::TimeDelta dialog_duration_; 54 base::TimeDelta dialog_duration_;
53 55
54 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray); 56 DISALLOW_COPY_AND_ASSIGN(LogoutButtonTray);
55 }; 57 };
56 58
57 } // namespace ash 59 } // namespace ash
58 60
59 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_ 61 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SESSION_LOGOUT_BUTTON_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698