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

Side by Side Diff: ash/common/test/test_session_state_delegate.cc

Issue 2648483002: chromeos: Rename various CreateShelf methods to CreateShelfView (Closed)
Patch Set: Created 3 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 (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/common/test/test_session_state_delegate.h" 5 #include "ash/common/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/common/login_status.h" 10 #include "ash/common/login_status.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 session_state_ = has_active_user 164 session_state_ = has_active_user
165 ? session_manager::SessionState::ACTIVE 165 ? session_manager::SessionState::ACTIVE
166 : session_manager::SessionState::LOGIN_PRIMARY; 166 : session_manager::SessionState::LOGIN_PRIMARY;
167 } 167 }
168 168
169 void TestSessionStateDelegate::SetActiveUserSessionStarted( 169 void TestSessionStateDelegate::SetActiveUserSessionStarted(
170 bool active_user_session_started) { 170 bool active_user_session_started) {
171 if (active_user_session_started) { 171 if (active_user_session_started) {
172 user_manager_->SessionStarted(); 172 user_manager_->SessionStarted();
173 session_state_ = session_manager::SessionState::ACTIVE; 173 session_state_ = session_manager::SessionState::ACTIVE;
174 WmShell::Get()->CreateShelf(); 174 WmShell::Get()->CreateShelfView();
175 WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER); 175 WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
176 } else { 176 } else {
177 session_state_ = session_manager::SessionState::LOGIN_PRIMARY; 177 session_state_ = session_manager::SessionState::LOGIN_PRIMARY;
178 user_manager_.reset(new TestUserManager()); 178 user_manager_.reset(new TestUserManager());
179 } 179 }
180 } 180 }
181 181
182 // static 182 // static
183 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) { 183 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) {
184 CHECK(WmShell::HasInstance()); 184 CHECK(WmShell::HasInstance());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 244 }
245 245
246 void TestSessionStateDelegate::AddSessionStateObserver( 246 void TestSessionStateDelegate::AddSessionStateObserver(
247 SessionStateObserver* observer) {} 247 SessionStateObserver* observer) {}
248 248
249 void TestSessionStateDelegate::RemoveSessionStateObserver( 249 void TestSessionStateDelegate::RemoveSessionStateObserver(
250 SessionStateObserver* observer) {} 250 SessionStateObserver* observer) {}
251 251
252 } // namespace test 252 } // namespace test
253 } // namespace ash 253 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698