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

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

Issue 2393083005: Moves Shell::CreateShelf() to WmShell (Closed)
Patch Set: fix shell Created 4 years, 2 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/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/common/login_status.h" 10 #include "ash/common/login_status.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 session_state_ = SESSION_STATE_ACTIVE; 168 session_state_ = SESSION_STATE_ACTIVE;
169 WmShell::Get()->ShowShelf(); 169 WmShell::Get()->ShowShelf();
170 } 170 }
171 } 171 }
172 172
173 void TestSessionStateDelegate::SetActiveUserSessionStarted( 173 void TestSessionStateDelegate::SetActiveUserSessionStarted(
174 bool active_user_session_started) { 174 bool active_user_session_started) {
175 if (active_user_session_started) { 175 if (active_user_session_started) {
176 user_manager_->SessionStarted(); 176 user_manager_->SessionStarted();
177 session_state_ = SESSION_STATE_ACTIVE; 177 session_state_ = SESSION_STATE_ACTIVE;
178 Shell::GetInstance()->CreateShelf(); 178 WmShell::Get()->CreateShelf();
179 Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER); 179 Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER);
180 } else { 180 } else {
181 session_state_ = SESSION_STATE_LOGIN_PRIMARY; 181 session_state_ = SESSION_STATE_LOGIN_PRIMARY;
182 user_manager_.reset(new TestUserManager()); 182 user_manager_.reset(new TestUserManager());
183 } 183 }
184 } 184 }
185 185
186 // static 186 // static
187 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) { 187 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) {
188 CHECK(WmShell::HasInstance()); 188 CHECK(WmShell::HasInstance());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 } 248 }
249 249
250 void TestSessionStateDelegate::AddSessionStateObserver( 250 void TestSessionStateDelegate::AddSessionStateObserver(
251 SessionStateObserver* observer) {} 251 SessionStateObserver* observer) {}
252 252
253 void TestSessionStateDelegate::RemoveSessionStateObserver( 253 void TestSessionStateDelegate::RemoveSessionStateObserver(
254 SessionStateObserver* observer) {} 254 SessionStateObserver* observer) {}
255 255
256 } // namespace test 256 } // namespace test
257 } // namespace ash 257 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698