chrome/browser/ui/webui/chromeos/login/oobe_ui.cc - Issue 16002004: Added login screen mode for adding users into session.

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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 16002004: Added login screen mode for adding users into session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: WebUI test fixed. Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe.html ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

index c103fa42511fc93b16bd82a4721d77c0efaf0617..7fdd4444441b79cc2399be316cee8c7c39c96251 100644

--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -330,21 +330,6 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {

localized_strings->SetString("bootIntoWallpaper", "off");

}

- // TODO(nkostylev): Make sure that only one type of login UI

- // is active at a time.

- // OobeUI is used for these use cases:

- // 1. Out-of-box / login

- // 2. Lock screen.

- // 3. Multi-profiles sign in (add user to current session).

- if (LoginDisplayHostImpl::default_host()) {

- if (!UserManager::Get()->IsUserLoggedIn())

- localized_strings->SetString("screenType", "login");

- else

- localized_strings->SetString("screenType", "login-add-user");

- } else {

- localized_strings->SetString("screenType", "lock");

- }

bool keyboard_driven_oobe = false;

system::StatisticsProvider::GetInstance()->GetMachineFlag(

chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe);