| Index: components/translate/core/browser/translate_language_list.h
|
| diff --git a/components/translate/core/browser/translate_language_list.h b/components/translate/core/browser/translate_language_list.h
|
| index e08d6817b4a527761542a6292ca53e19fe9fea68..1b6dadb378ea4ddde8f0a0a12db34963910edb25 100644
|
| --- a/components/translate/core/browser/translate_language_list.h
|
| +++ b/components/translate/core/browser/translate_language_list.h
|
| @@ -36,7 +36,7 @@ class TranslateLanguageList {
|
| base::Time last_updated() { return last_updated_; }
|
|
|
| // Fills |languages| with the list of languages that the translate server can
|
| - // translate to and from. |languages| will include alpha languages.
|
| + // translate to and from.
|
| void GetSupportedLanguages(std::vector<std::string>* languages);
|
|
|
| // Returns the language code that can be used with the Translate method for a
|
| @@ -44,14 +44,9 @@ class TranslateLanguageList {
|
| // GetLanguageCode("zh-CN") returns "zh-CN")
|
| std::string GetLanguageCode(const std::string& language);
|
|
|
| - // Returns true if |language| is supported by the translation server. It also
|
| - // returns true against alpha languages.
|
| + // Returns true if |language| is supported by the translation server.
|
| bool IsSupportedLanguage(const std::string& language);
|
|
|
| - // Returns true if |language| is supported by the translation server as a
|
| - // alpha language.
|
| - bool IsAlphaLanguage(const std::string& language);
|
| -
|
| // Fetches the language list from the translate server if resource requests
|
| // are allowed, and otherwise keeps the request as pending until allowed.
|
| void RequestLanguageList();
|
| @@ -74,12 +69,9 @@ class TranslateLanguageList {
|
|
|
| // static const values shared with our browser tests.
|
| static const char kTargetLanguagesKey[];
|
| - static const char kAlphaLanguagesKey[];
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(TranslateLanguageListTest, SetSupportedLanguages);
|
| - FRIEND_TEST_ALL_PREFIXES(TranslateLanguageListTest,
|
| - SetSupportedLanguagesWithAlphaKey);
|
|
|
| // Callback function called when TranslateURLFetcher::Request() is finished.
|
| void OnLanguageListFetchComplete(int id,
|
| @@ -106,14 +98,11 @@ class TranslateLanguageList {
|
| // True if the list has to be fetched when resource requests are allowed.
|
| bool request_pending_;
|
|
|
| - // All the languages supported by the translation server.
|
| - std::set<std::string> all_supported_languages_;
|
| -
|
| - // Alpha languages supported by the translation server.
|
| - std::set<std::string> alpha_languages_;
|
| + // The languages supported by the translation server.
|
| + std::set<std::string> supported_languages_;
|
|
|
| // A LanguageListFetcher instance to fetch a server providing supported
|
| - // language list including alpha languages.
|
| + // language list.
|
| std::unique_ptr<TranslateURLFetcher> language_list_fetcher_;
|
|
|
| // The last-updated time when the language list is sent.
|
|
|