chrome/browser/chromeos/login/user_adding_screen_browsertest.cc - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/user_adding_screen_browsertest.cc

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/user.cc ('k') | chrome/browser/chromeos/login/user_image_manager_browsertest.cc » ('j') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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/session_state_delegate.h"	5 #include "ash/session/session_state_delegate.h"

6 #include "ash/shell.h"	6 #include "ash/shell.h"

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/chromeos/login/login_display_host_impl.h"	8 #include "chrome/browser/chromeos/login/login_display_host_impl.h"

9 #include "chrome/browser/chromeos/login/login_manager_test.h"	9 #include "chrome/browser/chromeos/login/login_manager_test.h"

10 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h"	10 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h"

11 #include "chrome/browser/chromeos/login/startup_utils.h"	11 #include "chrome/browser/chromeos/login/startup_utils.h"

12 #include "chrome/browser/chromeos/login/user_adding_screen.h"	12 #include "chrome/browser/chromeos/login/user_adding_screen.h"

13 #include "chrome/browser/chromeos/login/user_manager.h"	13 #include "chrome/browser/chromeos/login/user_manager.h"

14 #include "chrome/common/chrome_switches.h"	14 #include "chrome/common/chrome_switches.h"

15 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

(...skipping 191 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
207 // not be listed on screen lock.	207 // not be listed on screen lock.

208 prefs3->SetString(prefs::kMultiProfileUserBehavior,	208 prefs3->SetString(prefs::kMultiProfileUserBehavior,

209 MultiProfileUserController::kBehaviorNotAllowed);	209 MultiProfileUserController::kBehaviorNotAllowed);

210 unlock_users = user_manager->GetUnlockUsers();	210 unlock_users = user_manager->GetUnlockUsers();

211 ASSERT_EQ(2UL, unlock_users.size());	211 ASSERT_EQ(2UL, unlock_users.size());

212 for (int i = 0; i < 2; ++i)	212 for (int i = 0; i < 2; ++i)

213 EXPECT_EQ(kTestUsers[i], unlock_users[i]->email());	213 EXPECT_EQ(kTestUsers[i], unlock_users[i]->email());

214 }	214 }

215	215

216 } // namespace chromeos	216 } // namespace chromeos

OLD	NEW