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

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

Issue 14139003: Chrome OS multi-profiles backend and UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
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 d443b755b3ef16534d65f157f9880fe764129dbf..6895c123f5d5f71a77af417f6d6e93002f6ea809 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -319,11 +319,20 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
localized_strings->SetString("bootIntoWallpaper", "off");
}
- // OobeUI is used for OOBE/login and lock screen.
- if (BaseLoginDisplayHost::default_host())
- localized_strings->SetString("screenType", "login");
- else
+ // 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 (BaseLoginDisplayHost::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");
+ }
}
void OobeUI::InitializeScreenMaps() {

Powered by Google App Engine
This is Rietveld 408576698