Revert 277718 "[Hotword] Remove non-English languages due to fea..."

trunk/src/chrome/browser/search/hotword_service.cc

 // Copyright 2013 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/search/hotword_service.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 27 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
 using extensions::BrowserContextKeyedAPIFactory;
 using extensions::HotwordPrivateEventService;
 #endif
 
 namespace {
 
 // Allowed languages for hotwording.
 static const char* kSupportedLocales[] = {
   "en",
-  "en_us",
+  "de",
+  "fr",
+  "ru"
 };
 
 // Enum describing the state of the hotword preference.
 // This is used for UMA stats -- do not reorder or delete items; only add to
 // the end.
 enum HotwordEnabled {
   UNSET = 0,  // The hotword preference has not been set.
   ENABLED,    // The hotword preference is enabled.
   DISABLED,   // The hotword preference is disabled.
   NUM_HOTWORD_ENABLED_METRICS
@@ skipping 100 matching lines @@
 #if defined(OS_CHROMEOS)
       // On ChromeOS locale is per-profile.
       profile->GetPrefs()->GetString(prefs::kApplicationLocale);
 #else
       g_browser_process->GetApplicationLocale();
 #endif
   std::string normalized_locale = l10n_util::NormalizeLocale(locale);
   StringToLowerASCII(&normalized_locale);
 
   for (size_t i = 0; i < arraysize(kSupportedLocales); i++) {
-    if (kSupportedLocales[i] == normalized_locale)
+    if (normalized_locale.compare(0, 2, kSupportedLocales[i]) == 0)
       return true;
   }
   return false;
 }
 
 HotwordService::HotwordService(Profile* profile)
     : profile_(profile),
       client_(NULL),
       error_message_(0) {
   // This will be called during profile initialization which is a good time
@@ skipping 182 matching lines @@
 
   DCHECK(client_ == client);
 
   client_ = NULL;
   HotwordPrivateEventService* event_service =
       BrowserContextKeyedAPIFactory<HotwordPrivateEventService>::Get(profile_);
   if (event_service)
     event_service->OnHotwordSessionStopped();
 #endif
 }