rollback omnibar icon changes based on UX feedback

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 "base/strings/string_number_conversions.h"
 #include "components/translate/core/browser/language_state.h"
@@ skipping 238 matching lines @@
   }
 }
 
 bool TranslateUIDelegate::IsLanguageBlocked() {
   return prefs_->IsBlockedLanguage(GetOriginalLanguageCode());
 }
 
 void TranslateUIDelegate::SetLanguageBlocked(bool value) {
   if (value) {
     prefs_->BlockLanguage(GetOriginalLanguageCode());
-    // In the new UI, we will keep showing the translate omnibar icon
-    // even if the language is blocked so in case the user just wants to
-    // translate that page the user can invoke the translate bubble from
-    // the omnibar icon.
-    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2) &&
-        translate_manager_) {
+    if (translate_manager_) {
       translate_manager_->GetLanguageState().SetTranslateEnabled(false);
     }
   } else {
     prefs_->UnblockLanguage(GetOriginalLanguageCode());
   }
 
   UMA_HISTOGRAM_BOOLEAN(kNeverTranslateLang, value);
 }
 
 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);
-    // In the new UI, we will keep showing the translate omnibar icon
-    // even if the site is blocked so in case the user just wants to
-    // translate that page the user can invoke the translate bubble from
-    // the omnibar icon.
-    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2) &&
-        translate_manager_) {
+    if (translate_manager_) {
       translate_manager_->GetLanguageState().SetTranslateEnabled(false);
     }
   } else {
     prefs_->RemoveSiteFromBlacklist(host);
   }
 
   UMA_HISTOGRAM_BOOLEAN(kNeverTranslateSite, value);
 }
 
 bool TranslateUIDelegate::ShouldAlwaysTranslate() {
@@ skipping 36 matching lines @@
   UMA_HISTOGRAM_BOOLEAN(kAlwaysTranslateLang, value);
 }
 
 std::string TranslateUIDelegate::GetPageHost() {
   if (!translate_driver_->HasCurrentPage())
     return std::string();
   return translate_driver_->GetLastCommittedURL().HostNoBrackets();
 }
 
 }  // namespace translate