chrome/browser/ui/webui/chromeos/login/network_screen_handler.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/ui/webui/chromeos/login/network_screen_handler.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: Implement options group in language select. Fix unittest. 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/app/chromeos_strings.grdp ('K') | « chrome/browser/resources/chromeos/login/oobe.js ('k') | chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h » ('j') | chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e568e45f267f33e66ae4f6cd6b4c56bf80d6adf8..fdbe9e30d04af502c4de839a3f01565563cd76e4 100644

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

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

@@ -22,6 +22,7 @@

#include "chromeos/ime/input_method_manager.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

+#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/rect.h"

#include "ui/views/layout/fill_layout.h"

#include "ui/views/widget/widget.h"

@@ -253,6 +254,10 @@ base::ListValue* NetworkScreenHandler::GetLanguageList() {

std::string native_name;

language_info->GetString("nativeDisplayName", &native_name);

+ // If it's option group divider, add field name.

+ if (value.empty())

Dmitry Polukhin 2014/01/28 19:40:30 Please add {} because it if(true) statement has tw

Alexander Alekseev 2014/01/29 15:39:00 Done.

+ language_info->SetString("optionGroupName",

+ l10n_util::GetStringUTF16(IDS_OTHER_LANGUAGES));

if (display_name != native_name)

display_name = base::StringPrintf("%s - %s",

display_name.c_str(),