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

Side by Side Diff: ash/test/test_session_state_delegate.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
« no previous file with comments | « ash/test/status_area_widget_test_helper.cc ('k') | ash/test/test_system_tray_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "ash/test/test_session_state_delegate.h" 5 #include "ash/test/test_session_state_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 Shell::GetInstance()->ShowShelf(); 168 Shell::GetInstance()->ShowShelf();
169 } 169 }
170 } 170 }
171 171
172 void TestSessionStateDelegate::SetActiveUserSessionStarted( 172 void TestSessionStateDelegate::SetActiveUserSessionStarted(
173 bool active_user_session_started) { 173 bool active_user_session_started) {
174 if (active_user_session_started) { 174 if (active_user_session_started) {
175 user_manager_->SessionStarted(); 175 user_manager_->SessionStarted();
176 session_state_ = SESSION_STATE_ACTIVE; 176 session_state_ = SESSION_STATE_ACTIVE;
177 Shell::GetInstance()->CreateShelf(); 177 Shell::GetInstance()->CreateShelf();
178 Shell::GetInstance()->UpdateAfterLoginStatusChange( 178 Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER);
179 user::LOGGED_IN_USER);
180 } else { 179 } else {
181 session_state_ = SESSION_STATE_LOGIN_PRIMARY; 180 session_state_ = SESSION_STATE_LOGIN_PRIMARY;
182 user_manager_.reset(new TestUserManager()); 181 user_manager_.reset(new TestUserManager());
183 } 182 }
184 } 183 }
185 184
186 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) { 185 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) {
187 can_lock_screen_ = can_lock_screen; 186 can_lock_screen_ = can_lock_screen;
188 } 187 }
189 188
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 void TestSessionStateDelegate::AddSessionStateObserver( 248 void TestSessionStateDelegate::AddSessionStateObserver(
250 SessionStateObserver* observer) { 249 SessionStateObserver* observer) {
251 } 250 }
252 251
253 void TestSessionStateDelegate::RemoveSessionStateObserver( 252 void TestSessionStateDelegate::RemoveSessionStateObserver(
254 SessionStateObserver* observer) { 253 SessionStateObserver* observer) {
255 } 254 }
256 255
257 } // namespace test 256 } // namespace test
258 } // namespace ash 257 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/status_area_widget_test_helper.cc ('k') | ash/test/test_system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698