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

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

 // Copyright (c) 2012 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/options/chromeos/cros_language_options_handler.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 231 matching lines @@
   // 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 iter = language_index.begin();
        iter != language_index.end();
        ++iter) {
     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(),
                   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 302 matching lines @@
         extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
     const extensions::Extension* extension =
         enabled_extensions.GetByID(extension_id);
     if (extension)
       entry->SetString("extensionName", extension->name());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos