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

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

Issue 783663003: Special check on Supervised User creation flow added to prevent misleading shelf alignment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/shell.h" 10 #include "ash/shell.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 void TestSessionStateDelegate::UnlockScreen() { 137 void TestSessionStateDelegate::UnlockScreen() {
138 screen_locked_ = false; 138 screen_locked_ = false;
139 } 139 }
140 140
141 bool TestSessionStateDelegate::IsUserSessionBlocked() const { 141 bool TestSessionStateDelegate::IsUserSessionBlocked() const {
142 return !IsActiveUserSessionStarted() || IsScreenLocked() || 142 return !IsActiveUserSessionStarted() || IsScreenLocked() ||
143 user_adding_screen_running_; 143 user_adding_screen_running_;
144 } 144 }
145 145
146 bool TestSessionStateDelegate::IsInSupervisedUserCreationFlow() const override {
147 return false;
148 }
149
146 SessionStateDelegate::SessionState TestSessionStateDelegate::GetSessionState() 150 SessionStateDelegate::SessionState TestSessionStateDelegate::GetSessionState()
147 const { 151 const {
148 if (user_adding_screen_running_) 152 if (user_adding_screen_running_)
149 return SESSION_STATE_LOGIN_SECONDARY; 153 return SESSION_STATE_LOGIN_SECONDARY;
150 154
151 // Assuming that if session is not active we're at login. 155 // Assuming that if session is not active we're at login.
152 return IsActiveUserSessionStarted() ? 156 return IsActiveUserSessionStarted() ?
153 SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY; 157 SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY;
154 } 158 }
155 159
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 void TestSessionStateDelegate::AddSessionStateObserver( 237 void TestSessionStateDelegate::AddSessionStateObserver(
234 SessionStateObserver* observer) { 238 SessionStateObserver* observer) {
235 } 239 }
236 240
237 void TestSessionStateDelegate::RemoveSessionStateObserver( 241 void TestSessionStateDelegate::RemoveSessionStateObserver(
238 SessionStateObserver* observer) { 242 SessionStateObserver* observer) {
239 } 243 }
240 244
241 } // namespace test 245 } // namespace test
242 } // namespace ash 246 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698