diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 23:47:52 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 23:47:52 +0000 |
| commit | 8ddce0c98690d84895edcb8a57c0cc6dec30c19d (patch) | |
| tree | f6e9be6ba339c4d48dbd88d61d9877a074412330 | |
| parent | d9df3b80f8248e621e7e0fdb25d0e9a2096f643d (diff) | |
| download | chromium_src-8ddce0c98690d84895edcb8a57c0cc6dec30c19d.zip chromium_src-8ddce0c98690d84895edcb8a57c0cc6dec30c19d.tar.gz chromium_src-8ddce0c98690d84895edcb8a57c0cc6dec30c19d.tar.bz2 | |
[Hotword] Remove extra languages because the feature was bumped.
BUG=361240
Review URL: https://codereview.chromium.org/228803003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262557 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/search/hotword_service.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/search/hotword_service_unittest.cc | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc index 6fac3ae..b2db1de 100644 --- a/chrome/browser/search/hotword_service.cc +++ b/chrome/browser/search/hotword_service.cc @@ -26,13 +26,7 @@ const int kMaxTimesToShowOptInPopup = 10; // Allowed languages for hotwording. static const char* kSupportedLocales[] = { "en", - "en_us", - "en_gb", - "en_ca", - "en_au", - "fr_fr", - "de_de", - "ru_ru" + "en_us" }; // Enum describing the state of the hotword preference. diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc index 5da13fe..03b2a5a 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc @@ -145,10 +145,6 @@ TEST_F(HotwordServiceTest, IsHotwordAllowedLocale) { EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); SetApplicationLocale(static_cast<Profile*>(profile.get()), "en_us"); EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); - SetApplicationLocale(static_cast<Profile*>(profile.get()), "de_DE"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); - SetApplicationLocale(static_cast<Profile*>(profile.get()), "fr_fr"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); // Test that incognito even with a valid locale and valid field trial // still returns false. |