chrome/browser/chromeos/login/login_display_host_impl.cc - Issue 144363006: Expand VPD initial_locale to a list of locales. Use the expanded VPD initial_locale on the OOBE.

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/chromeos/login/login_display_host_impl.cc

Issue 144363006: Expand VPD initial_locale to a list of locales. Use the expanded VPD initial_locale on the OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 6 years, 11 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

« chrome/browser/chromeos/customization_document.cc ('K') | « chrome/browser/chromeos/customization_document.cc ('k') | chrome/browser/resources/chromeos/login/oobe.js » ('j') | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/login_display_host_impl.cc

diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc

index a1c97356f7a0856d0e53da1e5e3adae962c05704..7e21244d7de294efc684619e7f88272c144d6a15 100644

--- a/chrome/browser/chromeos/login/login_display_host_impl.cc

+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc

@@ -1164,7 +1164,7 @@ void ShowLoginWizard(const std::string& first_screen_name) {

const std::string current_locale =

prefs->GetString(prefs::kApplicationLocale);

VLOG(1) << "Current locale: " << current_locale;

- std::string locale = startup_manifest->initial_locale();

+ std::string locale = startup_manifest->initial_locale_default();

if (!current_locale.empty() || locale.empty()) {

ShowLoginWizardFinish(first_screen_name, startup_manifest, display_host);