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) {
+      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());
 }
 
 void TranslateUIDelegate::SetLanguageBlocked(bool value) {
   if (value) {
     prefs_->BlockLanguage(GetOriginalLanguageCode());
-    if (translate_manager_) {
-      translate_manager_->GetLanguageState().SetTranslateEnabled(false);
+    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2)) {

[msw, 2016/04/29 20:00:03]

nit: combine nested if with &&

[ftang, 2016/04/29 22:37:03]

Done.

+      if (translate_manager_) {
+        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)) {

[msw, 2016/04/29 20:00:03]

nit: combine nested if with &&

[ftang, 2016/04/29 22:37:03]

Done.

+      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.

[msw, 2016/04/29 20:00:03]

Why does this comment reference 2, but the check is for 3? I'm not really sure
this comment makes much sense... consider rewriting it for clarity.

[ftang, 2016/04/29 22:37:03]

Done.

+      // it is == 2 not >2 because if the user translate with always on

[msw, 2016/04/29 20:00:03]

Capitalize 'it', '> 2'... 'translates'

[ftang, 2016/04/29 22:37:03]

Done.

+      // 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,

[msw, 2016/04/29 20:00:03]

unchecks

[ftang, 2016/04/29 22:37:03]

Done.

+      // but in that case since user explictly uncheck, we should show

[msw, 2016/04/29 20:00:03]

'unchecked it', 'show it as unchecked'...

[ftang, 2016/04/29 22:37:03]

Done.

+      // 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