diff options
| author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 21:30:58 +0000 |
|---|---|---|
| committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 21:30:58 +0000 |
| commit | 016af54060c480dd1473e10f86bbf67f1fce85de (patch) | |
| tree | 87b4919e28525a53bcaa722c90c5f7f4027f8320 /chrome/browser/ui/webui | |
| parent | 748e647a09bf44eb993022f31495efd5b58e7d3d (diff) | |
| download | chromium_src-016af54060c480dd1473e10f86bbf67f1fce85de.zip chromium_src-016af54060c480dd1473e10f86bbf67f1fce85de.tar.gz chromium_src-016af54060c480dd1473e10f86bbf67f1fce85de.tar.bz2 | |
Revert of ChromeOS: should not show "Language changed" notification for certain languages. (patchset #6 of https://codereview.chromium.org/382973002/)
Reason for revert:
Link failure of browser_tests on ChromiumOS build bot:
http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=Linux%20ChromiumOS%20Builder%20%28dbg%29&number=50192
Original issue's description:
> ChromeOS: should not show "Language changed" notification for certain languages.
>
> BUG=317718
> TEST=manually tested
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289985
NOTREECHECKS=true
NOTRY=true
TBR=alemate@chromium.org, nkostylev@chromium.org, jshin@chromium.org
Review URL: https://codereview.chromium.org/471403005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/l10n_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc index b981f8b..34a690d 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc @@ -126,10 +126,10 @@ scoped_ptr<base::ListValue> GetLanguageList( it != language_index.end(); ++it) { const std::string& language_id = it->first; - const std::string lang = l10n_util::GetLanguage(language_id); + const size_t dash_pos = language_id.find_first_of('-'); // Ignore non-specific codes. - if (lang.empty() || lang == language_id) + if (dash_pos == std::string::npos || dash_pos == 0) continue; if (std::find(base_language_codes.begin(), |