Implement the 2016Q2 Translate UI designe spec out in

components/translate/core/browser/translate_ui_delegate.cc

 // Copyright 2014 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 "components/translate/core/browser/translate_ui_delegate.h"
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/browser/translate_client.h"
@@ skipping 187 matching lines @@
 
 std::string TranslateUIDelegate::GetTargetLanguageCode() const {
   return (GetTargetLanguageIndex() == kNoIndex)
              ? translate::kUnknownLanguageCode
              : GetLanguageCodeAt(GetTargetLanguageIndex());
 }
 
 void TranslateUIDelegate::Translate() {
   if (!translate_driver_->IsOffTheRecord()) {
     prefs_->ResetTranslationDeniedCount(GetOriginalLanguageCode());
+    prefs_->ResetTranslationIgnoredCount(GetOriginalLanguageCode());
     prefs_->IncrementTranslationAcceptedCount(GetOriginalLanguageCode());
   }
 
   if (translate_manager_) {
     translate_manager_->TranslatePage(
         GetOriginalLanguageCode(), GetTargetLanguageCode(), false);
     UMA_HISTOGRAM_BOOLEAN(kPerformTranslate, true);
   }
 }
 
 void TranslateUIDelegate::RevertTranslation() {
   if (translate_manager_) {
     translate_manager_->RevertTranslation();
     UMA_HISTOGRAM_BOOLEAN(kRevertTranslation, true);
   }
 }
 
 void TranslateUIDelegate::TranslationDeclined(bool explicitly_closed) {
-  if (explicitly_closed && !translate_driver_->IsOffTheRecord()) {
+  if (!translate_driver_->IsOffTheRecord()) {
     const std::string& language = GetOriginalLanguageCode();
-    prefs_->ResetTranslationAcceptedCount(language);
-    prefs_->IncrementTranslationDeniedCount(language);
-    prefs_->UpdateLastDeniedTime(language);
+    if (explicitly_closed) {

[groby-ooo-7-16, 2016/04/27 19:08:25]

Can we get unit tests?

+      prefs_->ResetTranslationAcceptedCount(language);
+      prefs_->IncrementTranslationDeniedCount(language);
+      prefs_->UpdateLastDeniedTime(language);
+    } else {
+      prefs_->IncrementTranslationIgnoredCount(language);
+    }
   }
 
   // Remember that the user declined the translation so as to prevent showing a
   // translate UI for that page again.  (TranslateManager initiates translations
   // when getting a LANGUAGE_DETERMINED from the page, which happens when a load
   // stops. That could happen multiple times, including after the user already
   // declined the translation.)
   if (explicitly_closed && translate_manager_) {
     translate_manager_->GetLanguageState().set_translation_declined(true);
     UMA_HISTOGRAM_BOOLEAN(kDeclineTranslate, true);
   }
 
   if (!explicitly_closed) {
     UMA_HISTOGRAM_BOOLEAN(kDeclineTranslateDismissUI, true);
   }
 }
 
 bool TranslateUIDelegate::IsLanguageBlocked() {
   return prefs_->IsBlockedLanguage(GetOriginalLanguageCode());
 }
 
+

[groby-ooo-7-16, 2016/04/27 19:08:25]

nit:Please remove

[ftang, 2016/04/27 21:43:16]

Done.

 void TranslateUIDelegate::SetLanguageBlocked(bool value) {
   if (value) {
     prefs_->BlockLanguage(GetOriginalLanguageCode());
-    if (translate_manager_) {
-      translate_manager_->GetLanguageState().SetTranslateEnabled(false);
+    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2)) {
+      if (translate_manager_) {

[groby-ooo-7-16, 2016/04/27 19:08:25]

Why are we not resetting TranslateEnabled for the new UI?

[ftang, 2016/04/27 21:43:16]

In the new ui, the omnibar icon is always shown, regardless the site/language is
set to never or not. This give the user a chance to "change their mind" in the
new ui. Without that, there are no easy way for user to figure out how to "undo"
what they set. see slide 20 "but show the omnibar icon"

[groby-ooo-7-16, 2016/04/29 05:26:14]

Ah, I understand - thanks for the explanation. Would you mind leaving a short
comment that this is the desired effect? It's not obvious at first glance that
SetTranslateEnabled(false) keeps the icon visible :)

+        translate_manager_->GetLanguageState().SetTranslateEnabled(false);
+      }
     }
   } else {
     prefs_->UnblockLanguage(GetOriginalLanguageCode());
   }
 
   UMA_HISTOGRAM_BOOLEAN(kNeverTranslateLang, true);
 }
 
 bool TranslateUIDelegate::IsSiteBlacklisted() {
   std::string host = GetPageHost();
   return !host.empty() && prefs_->IsSiteBlacklisted(host);
 }
 
 void TranslateUIDelegate::SetSiteBlacklist(bool value) {
   std::string host = GetPageHost();
   if (host.empty())
     return;
 
   if (value) {
     prefs_->BlacklistSite(host);
-    if (translate_manager_) {
-      translate_manager_->GetLanguageState().SetTranslateEnabled(false);
+    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2)) {
+      if (translate_manager_) {
+        translate_manager_->GetLanguageState().SetTranslateEnabled(false);
+      }
     }
   } else {
     prefs_->RemoveSiteFromBlacklist(host);
   }
 
   UMA_HISTOGRAM_BOOLEAN(kNeverTranslateSite, true);
 }
 
 bool TranslateUIDelegate::ShouldAlwaysTranslate() {
   return prefs_->IsLanguagePairWhitelisted(GetOriginalLanguageCode(),
                                            GetTargetLanguageCode());
 }
 
+bool TranslateUIDelegate::ShowAlwaysTranslateChecked() {
+  return ShouldAlwaysTranslate() ||
+      // After 2 clicks on Translate for the same language.
+      // it is == 2 not >2 because if the user translate with always on
+      // the next time the bubble won't show up. So the only chance the
+      // bubble will show up is if the user uncheck the Always translate,
+      // but in that case since user explictly uncheck, we should show
+      // as uncheck.
+      prefs_->GetTranslationAcceptedCount(GetOriginalLanguageCode()) == 3;
+}
+
 void TranslateUIDelegate::SetAlwaysTranslate(bool value) {
   const std::string& original_lang = GetOriginalLanguageCode();
   const std::string& target_lang = GetTargetLanguageCode();
   if (value)
     prefs_->WhitelistLanguagePair(original_lang, target_lang);
   else
     prefs_->RemoveLanguagePairFromWhitelist(original_lang, target_lang);
 
   UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, true);
 }
 
 std::string TranslateUIDelegate::GetPageHost() {
   if (!translate_driver_->HasCurrentPage())
     return std::string();
   return translate_driver_->GetLastCommittedURL().HostNoBrackets();
 }
 
 }  // namespace translate