ChromeOS: should not show "Language changed" notification for certain languages.

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 108 matching lines @@
   // Build the list of display names, and build the language map.
 
   // The list of configured locales might have entries not in
   // base_language_codes. If there are unsupported language variants,
   // but they resolve to backup locale within base_language_codes, also
   // add them to the list.
   for (std::map<std::string, int>::const_iterator it = language_index.begin();
        it != language_index.end(); ++it) {
     const std::string& language_id = it->first;
 
-    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(),
                   base_language_codes.end(),
                   language_id) != base_language_codes.end()) {
       // Language is supported. No need to replace
       continue;
     }
     std::string resolved_locale;
     if (!l10n_util::CheckAndResolveLocale(language_id, &resolved_locale))
@@ skipping 324 matching lines @@
 }
 
 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() {
   const input_method::InputMethodDescriptor current_input_method =
       input_method::InputMethodManager::Get()->GetCurrentInputMethod();
   return CreateInputMethodsEntry(current_input_method,
                                  current_input_method.id());
 }
 
 }  // namespace chromeos