OLD | NEW |
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 #include "ash/system/chromeos/session/logout_button_tray.h" | 5 #include "ash/system/chromeos/session/logout_button_tray.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/shelf/shelf_types.h" | 10 #include "ash/common/shelf/shelf_types.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "ui/views/controls/button/label_button.h" | 27 #include "ui/views/controls/button/label_button.h" |
28 #include "ui/views/controls/button/label_button_border.h" | 28 #include "ui/views/controls/button/label_button_border.h" |
29 #include "ui/views/painter.h" | 29 #include "ui/views/painter.h" |
30 | 30 |
31 namespace ash { | 31 namespace ash { |
32 namespace { | 32 namespace { |
33 | 33 |
34 const int kLogoutButtonHorizontalExtraPadding = 7; | 34 const int kLogoutButtonHorizontalExtraPadding = 7; |
35 | 35 |
36 const int kLogoutButtonNormalImages[] = { | 36 const int kLogoutButtonNormalImages[] = { |
37 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT, | 37 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT, |
38 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP, | 38 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP, |
39 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT, | 39 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT, |
40 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT, | 40 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT, |
41 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER, | 41 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER, |
42 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT, | 42 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT, |
43 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT, | 43 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT, |
44 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM, | 44 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM, |
45 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT | 45 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT}; |
46 }; | |
47 | 46 |
48 const int kLogoutButtonPushedImages[] = { | 47 const int kLogoutButtonPushedImages[] = { |
49 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT, | 48 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT, |
50 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP, | 49 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP, |
51 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT, | 50 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT, |
52 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT, | 51 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT, |
53 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER, | 52 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER, |
54 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT, | 53 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT, |
55 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT, | 54 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT, |
56 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM, | 55 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM, |
57 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT | 56 IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT}; |
58 }; | |
59 | 57 |
60 class LogoutButton : public views::LabelButton { | 58 class LogoutButton : public views::LabelButton { |
61 public: | 59 public: |
62 LogoutButton(views::ButtonListener* listener); | 60 LogoutButton(views::ButtonListener* listener); |
63 ~LogoutButton() override; | 61 ~LogoutButton() override; |
64 | 62 |
65 private: | 63 private: |
66 DISALLOW_COPY_AND_ASSIGN(LogoutButton); | 64 DISALLOW_COPY_AND_ASSIGN(LogoutButton); |
67 }; | 65 }; |
68 | 66 |
69 } // namespace | 67 } // namespace |
70 | 68 |
71 LogoutButton::LogoutButton(views::ButtonListener* listener) | 69 LogoutButton::LogoutButton(views::ButtonListener* listener) |
72 : views::LabelButton(listener, base::string16()) { | 70 : views::LabelButton(listener, base::string16()) { |
73 SetupLabelForTray(label()); | 71 SetupLabelForTray(label()); |
74 SetFontList(label()->font_list()); | 72 SetFontList(label()->font_list()); |
75 SetEnabledTextColors(SK_ColorWHITE); | 73 SetEnabledTextColors(SK_ColorWHITE); |
76 | 74 |
77 std::unique_ptr<views::LabelButtonAssetBorder> border( | 75 std::unique_ptr<views::LabelButtonAssetBorder> border( |
78 new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON)); | 76 new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON)); |
79 border->SetPainter(false, views::Button::STATE_NORMAL, | 77 border->SetPainter( |
| 78 false, views::Button::STATE_NORMAL, |
80 views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages)); | 79 views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages)); |
81 border->SetPainter(false, views::Button::STATE_HOVERED, | 80 border->SetPainter( |
| 81 false, views::Button::STATE_HOVERED, |
82 views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages)); | 82 views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages)); |
83 border->SetPainter(false, views::Button::STATE_PRESSED, | 83 border->SetPainter( |
| 84 false, views::Button::STATE_PRESSED, |
84 views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages)); | 85 views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages)); |
85 gfx::Insets insets = border->GetInsets(); | 86 gfx::Insets insets = border->GetInsets(); |
86 insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding, | 87 insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding, 0, |
87 0, kLogoutButtonHorizontalExtraPadding); | 88 kLogoutButtonHorizontalExtraPadding); |
88 border->set_insets(insets); | 89 border->set_insets(insets); |
89 SetBorder(std::move(border)); | 90 SetBorder(std::move(border)); |
90 set_animate_on_state_change(false); | 91 set_animate_on_state_change(false); |
91 | 92 |
92 SetMinSize(gfx::Size(0, kShelfItemHeight)); | 93 SetMinSize(gfx::Size(0, kShelfItemHeight)); |
93 } | 94 } |
94 | 95 |
95 LogoutButton::~LogoutButton() { | 96 LogoutButton::~LogoutButton() {} |
96 } | |
97 | 97 |
98 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget) | 98 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget) |
99 : TrayBackgroundView(status_area_widget->wm_shelf()), | 99 : TrayBackgroundView(status_area_widget->wm_shelf()), |
100 button_(NULL), | 100 button_(NULL), |
101 login_status_(LoginStatus::NOT_LOGGED_IN), | 101 login_status_(LoginStatus::NOT_LOGGED_IN), |
102 show_logout_button_in_tray_(false) { | 102 show_logout_button_in_tray_(false) { |
103 button_ = new LogoutButton(this); | 103 button_ = new LogoutButton(this); |
104 tray_container()->AddChildView(button_); | 104 tray_container()->AddChildView(button_); |
105 tray_container()->SetBorder(views::Border::NullBorder()); | 105 tray_container()->SetBorder(views::Border::NullBorder()); |
106 WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this); | 106 WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this); |
107 } | 107 } |
108 | 108 |
109 LogoutButtonTray::~LogoutButtonTray() { | 109 LogoutButtonTray::~LogoutButtonTray() { |
110 WmShell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this); | 110 WmShell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this); |
111 } | 111 } |
112 | 112 |
113 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) { | 113 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) { |
114 TrayBackgroundView::SetShelfAlignment(alignment); | 114 TrayBackgroundView::SetShelfAlignment(alignment); |
115 tray_container()->SetBorder(views::Border::NullBorder()); | 115 tray_container()->SetBorder(views::Border::NullBorder()); |
116 } | 116 } |
117 | 117 |
118 base::string16 LogoutButtonTray::GetAccessibleNameForTray() { | 118 base::string16 LogoutButtonTray::GetAccessibleNameForTray() { |
119 return button_->GetText(); | 119 return button_->GetText(); |
120 } | 120 } |
121 | 121 |
122 void LogoutButtonTray::HideBubbleWithView( | 122 void LogoutButtonTray::HideBubbleWithView( |
123 const views::TrayBubbleView* bubble_view) { | 123 const views::TrayBubbleView* bubble_view) {} |
124 } | |
125 | 124 |
126 void LogoutButtonTray::ClickedOutsideBubble() {} | 125 void LogoutButtonTray::ClickedOutsideBubble() {} |
127 | 126 |
128 void LogoutButtonTray::OnShowLogoutButtonInTrayChanged(bool show) { | 127 void LogoutButtonTray::OnShowLogoutButtonInTrayChanged(bool show) { |
129 show_logout_button_in_tray_ = show; | 128 show_logout_button_in_tray_ = show; |
130 UpdateVisibility(); | 129 UpdateVisibility(); |
131 } | 130 } |
132 | 131 |
133 void LogoutButtonTray::OnLogoutDialogDurationChanged(base::TimeDelta duration) { | 132 void LogoutButtonTray::OnLogoutDialogDurationChanged(base::TimeDelta duration) { |
134 dialog_duration_ = duration; | 133 dialog_duration_ = duration; |
(...skipping 20 matching lines...) Expand all Loading... |
155 UpdateVisibility(); | 154 UpdateVisibility(); |
156 } | 155 } |
157 | 156 |
158 void LogoutButtonTray::UpdateVisibility() { | 157 void LogoutButtonTray::UpdateVisibility() { |
159 SetVisible(show_logout_button_in_tray_ && | 158 SetVisible(show_logout_button_in_tray_ && |
160 login_status_ != LoginStatus::NOT_LOGGED_IN && | 159 login_status_ != LoginStatus::NOT_LOGGED_IN && |
161 login_status_ != LoginStatus::LOCKED); | 160 login_status_ != LoginStatus::LOCKED); |
162 } | 161 } |
163 | 162 |
164 } // namespace ash | 163 } // namespace ash |
OLD | NEW |