chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc - Issue 382973002: ChromeOS: should not show "Language changed" notification for certain languages.

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/options/chromeos/cros_language_options_handler.cc

Issue 382973002: ChromeOS: should not show "Language changed" notification for certain languages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bugfix. Created 6 years, 5 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/locale_change_guard_unittest.cc ('K') | « chrome/browser/chromeos/locale_change_guard_unittest.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

index 3c31fccf733cf60ed4d0e8b06112999b837e375c..e203ed04bb524e7c99f995728eee56d13ff8dd8e 100644

--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

@@ -249,10 +249,10 @@ base::ListValue* CrosLanguageOptionsHandler::GetLanguageListInternal(

const std::string& language_id = iter->first;

const int language_idx = iter->second;

- const size_t dash_pos = language_id.find_first_of('-');

+ const std::string lang = l10n_util::GetLanguage(language_id);

// Ignore non-specific codes.

- if (dash_pos == std::string::npos || dash_pos == 0)

+ if (lang.empty() || lang == language_id)

continue;

if (std::find(base_language_codes.begin(),