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

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

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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 #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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 SetMinSize(gfx::Size(0, kShelfItemHeight)); 90 SetMinSize(gfx::Size(0, kShelfItemHeight));
91 } 91 }
92 92
93 LogoutButton::~LogoutButton() { 93 LogoutButton::~LogoutButton() {
94 } 94 }
95 95
96 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget) 96 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget)
97 : TrayBackgroundView(status_area_widget), 97 : TrayBackgroundView(status_area_widget),
98 button_(NULL), 98 button_(NULL),
99 login_status_(user::LOGGED_IN_NONE), 99 login_status_(LoginStatus::NOT_LOGGED_IN),
100 show_logout_button_in_tray_(false) { 100 show_logout_button_in_tray_(false) {
101 button_ = new LogoutButton(this); 101 button_ = new LogoutButton(this);
102 tray_container()->AddChildView(button_); 102 tray_container()->AddChildView(button_);
103 tray_container()->SetBorder(views::Border::NullBorder()); 103 tray_container()->SetBorder(views::Border::NullBorder());
104 Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this); 104 Shell::GetInstance()->system_tray_notifier()->AddLogoutButtonObserver(this);
105 } 105 }
106 106
107 LogoutButtonTray::~LogoutButtonTray() { 107 LogoutButtonTray::~LogoutButtonTray() {
108 Shell::GetInstance()->system_tray_notifier()-> 108 Shell::GetInstance()->system_tray_notifier()->
109 RemoveLogoutButtonObserver(this); 109 RemoveLogoutButtonObserver(this);
(...skipping 28 matching lines...) Expand all
138 DCHECK_EQ(sender, button_); 138 DCHECK_EQ(sender, button_);
139 if (dialog_duration_ <= base::TimeDelta()) { 139 if (dialog_duration_ <= base::TimeDelta()) {
140 // Sign out immediately if |dialog_duration_| is non-positive. 140 // Sign out immediately if |dialog_duration_| is non-positive.
141 Shell::GetInstance()->system_tray_delegate()->SignOut(); 141 Shell::GetInstance()->system_tray_delegate()->SignOut();
142 } else if (Shell::GetInstance()->logout_confirmation_controller()) { 142 } else if (Shell::GetInstance()->logout_confirmation_controller()) {
143 Shell::GetInstance()->logout_confirmation_controller()->ConfirmLogout( 143 Shell::GetInstance()->logout_confirmation_controller()->ConfirmLogout(
144 base::TimeTicks::Now() + dialog_duration_); 144 base::TimeTicks::Now() + dialog_duration_);
145 } 145 }
146 } 146 }
147 147
148 void LogoutButtonTray::UpdateAfterLoginStatusChange( 148 void LogoutButtonTray::UpdateAfterLoginStatusChange(LoginStatus login_status) {
149 user::LoginStatus login_status) {
150 login_status_ = login_status; 149 login_status_ = login_status;
151 const base::string16 title = 150 const base::string16 title =
152 GetLocalizedSignOutStringForStatus(login_status, false); 151 user::GetLocalizedSignOutStringForStatus(login_status, false);
153 button_->SetText(title); 152 button_->SetText(title);
154 button_->SetAccessibleName(title); 153 button_->SetAccessibleName(title);
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_ != user::LOGGED_IN_NONE && 159 login_status_ != LoginStatus::NOT_LOGGED_IN &&
161 login_status_ != user::LOGGED_IN_LOCKED); 160 login_status_ != LoginStatus::LOCKED);
162 } 161 }
163 162
164 } // namespace ash 163 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/session/logout_button_tray.h ('k') | ash/system/chromeos/session/tray_session_length_limit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698