chrome/browser/chromeos/login/app_launch_signin_screen.cc - Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext

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/app_launch_signin_screen.cc

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nit Created 5 years, 10 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 | « chrome/browser/chromeos/login/app_launch_controller.cc ('k') | chrome/browser/chromeos/login/enable_debugging_browsertest.cc » ('j') | chrome/browser/ui/webui/chromeos/login/error_screen_handler.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 "chrome/browser/chromeos/login/app_launch_signin_screen.h"	5 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"

6	6

7 #include "base/values.h"	7 #include "base/values.h"

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

9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"	9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"

10 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	10 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

11 #include "chrome/browser/signin/screenlock_bridge.h"	11 #include "chrome/browser/signin/screenlock_bridge.h"

12 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"	12 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

13 #include "chrome/grit/generated_resources.h"	13 #include "chrome/grit/generated_resources.h"

	14 #include "chromeos/login/auth/user_context.h"

14 #include "components/user_manager/user_manager.h"	15 #include "components/user_manager/user_manager.h"

15 #include "content/public/browser/browser_thread.h"	16 #include "content/public/browser/browser_thread.h"

16 #include "content/public/browser/web_ui.h"	17 #include "content/public/browser/web_ui.h"

17 #include "ui/base/l10n/l10n_util.h"	18 #include "ui/base/l10n/l10n_util.h"

18	19

19 namespace chromeos {	20 namespace chromeos {

20	21

21 user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL;	22 user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL;

22	23

23 AppLaunchSigninScreen::AppLaunchSigninScreen(	24 AppLaunchSigninScreen::AppLaunchSigninScreen(

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
212 initial_auth_type,	213 initial_auth_type,

213 NULL, /* public_session_recommended_locales */	214 NULL, /* public_session_recommended_locales */

214 user_dict);	215 user_dict);

215 users_list.Append(user_dict);	216 users_list.Append(user_dict);

216 }	217 }

217	218

218 webui_handler_->LoadUsers(users_list, false);	219 webui_handler_->LoadUsers(users_list, false);

219 }	220 }

220	221

221 } // namespace chromeos	222 } // namespace chromeos

OLD	NEW