Index: chrome/browser/translate/chrome_translate_client.cc |
diff --git a/chrome/browser/translate/chrome_translate_client.cc b/chrome/browser/translate/chrome_translate_client.cc |
index 37e559760981b6aa4632cf4a56f668a8e5176166..37b635f5abb236cd872ad48cb7dbbc13f16f5ca3 100644 |
--- a/chrome/browser/translate/chrome_translate_client.cc |
+++ b/chrome/browser/translate/chrome_translate_client.cc |
@@ -226,19 +226,18 @@ void ChromeTranslateClient::ShowTranslateUI( |
// In the new UI, continue offering translation after the user navigates to |
// another page. |
if (!base::FeatureList::IsEnabled(translate::kTranslateUI2016Q2) && |
groby-ooo-7-16
2017/04/10 20:52:47
I _really_ would prefer if this logic could be mov
hamelphi
2017/04/11 22:46:07
I moved the logic to TranslateManager. Let me know
hamelphi
2017/04/12 21:10:53
Unittests done.
|
- !GetLanguageState().HasLanguageChanged()) { |
- translate_manager_->RecordTranslateEvent( |
- metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE); |
+ !GetLanguageState().HasLanguageChanged() && |
+ !translate_manager_->ShouldOverrideDecision( |
+ metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE)) { |
return; |
} |
- |
if (!triggered_from_menu && |
- GetTranslatePrefs()->IsTooOftenDenied(source_language)) { |
- translate_manager_->RecordTranslateEvent( |
- metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST); |
+ GetTranslatePrefs()->IsTooOftenDenied(source_language) && |
+ !translate_manager_->ShouldOverrideDecision( |
+ metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST)) |
return; |
- } |
} |
+ |
ShowTranslateBubbleResult result = ShowBubble(step, error_type); |
if (result != ShowTranslateBubbleResult::SUCCESS && |
step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE) { |