| Index: chrome/browser/translate/translate_service.cc
|
| diff --git a/chrome/browser/translate/translate_service.cc b/chrome/browser/translate/translate_service.cc
|
| index 5507846d4f1206fdde69bcefdde93e56f8befc3c..7203b65e6a65feb42b9841d26b435d85e5ce9006 100644
|
| --- a/chrome/browser/translate/translate_service.cc
|
| +++ b/chrome/browser/translate/translate_service.cc
|
| @@ -26,7 +26,7 @@ namespace {
|
| TranslateService* g_translate_service = NULL;
|
| }
|
|
|
| -TranslateService::TranslateService() : use_infobar_(false) {
|
| +TranslateService::TranslateService() {
|
| resource_request_allowed_notifier_.Init(this);
|
| }
|
|
|
| @@ -90,25 +90,18 @@ void TranslateService::OnResourceRequestsAllowed() {
|
| // static
|
| bool TranslateService::IsTranslateBubbleEnabled() {
|
| #if defined(USE_AURA)
|
| - Initialize();
|
| - return !g_translate_service->use_infobar_;
|
| + return true;
|
| #elif defined(OS_MACOSX)
|
| // The bubble UX is experimental on Mac OS X.
|
| return CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableTranslateNewUX);
|
| #else
|
| - // The bubble UX is not implemented on the non-Aura platforms.
|
| + // The bubble UX is not implemented on other platforms.
|
| return false;
|
| #endif
|
| }
|
|
|
| // static
|
| -void TranslateService::SetUseInfobar(bool value) {
|
| - Initialize();
|
| - g_translate_service->use_infobar_ = value;
|
| -}
|
| -
|
| -// static
|
| std::string TranslateService::GetTargetLanguage(PrefService* prefs) {
|
| std::vector<std::string> accept_languages_list;
|
| base::SplitString(prefs->GetString(prefs::kAcceptLanguages), ',',
|
|
|