Replace OnPageTranslate Obsever by a responder of delegate.

components/translate/core/browser/translate_infobar_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_infobar_delegate.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/feature_list.h"
@@ skipping 83 matching lines @@
     return;
   }
 
   // Find any existing translate infobar delegate.
   infobars::InfoBar* old_infobar = NULL;
   TranslateInfoBarDelegate* old_delegate = NULL;
   for (size_t i = 0; i < infobar_manager->infobar_count(); ++i) {
     old_infobar = infobar_manager->infobar_at(i);
     old_delegate = old_infobar->delegate()->AsTranslateInfoBarDelegate();
     if (old_delegate) {
-      if (!replace_existing_infobar || IsCompactUIEnabled())
+      if (!replace_existing_infobar)
         return;
       break;
     }
   }
 
+  // Try to reuse existing translate infobar delegate.
+  if (old_delegate && old_delegate->observer_) {
+    old_delegate->observer_->OnTranslateStepChanged(step, error_type);
+    return;
+  }
+
   // Add the new delegate.
   TranslateClient* translate_client = translate_manager->translate_client();
   std::unique_ptr<infobars::InfoBar> infobar(translate_client->CreateInfoBar(
       base::WrapUnique(new TranslateInfoBarDelegate(
           translate_manager, is_off_the_record, step, original_language,
           target_language, error_type, triggered_from_menu))));
   if (old_delegate)
     infobar_manager->ReplaceInfoBar(old_infobar, std::move(infobar));
   else
     infobar_manager->AddInfoBar(std::move(infobar));
 }
 
 // static
 bool TranslateInfoBarDelegate::IsCompactUIEnabled() {
   return base::FeatureList::IsEnabled(kTranslateCompactUI);
 }
 
+void TranslateInfoBarDelegate::SetObserver(Observer* observer) {
+  observer_ = observer;
+}
+
 void TranslateInfoBarDelegate::UpdateOriginalLanguage(
     const std::string& language_code) {
   ui_delegate_.UpdateOriginalLanguage(language_code);
 }
 
 void TranslateInfoBarDelegate::UpdateTargetLanguage(
     const std::string& language_code) {
   ui_delegate_.UpdateTargetLanguage(language_code);
 }
 
@@ skipping 217 matching lines @@
     const std::string& target_language,
     TranslateErrors::Type error_type,
     bool triggered_from_menu)
     : infobars::InfoBarDelegate(),
       is_off_the_record_(is_off_the_record),
       step_(step),
       ui_delegate_(translate_manager, original_language, target_language),
       translate_manager_(translate_manager),
       error_type_(error_type),
       prefs_(translate_manager->translate_client()->GetTranslatePrefs()),
-      triggered_from_menu_(triggered_from_menu) {
+      triggered_from_menu_(triggered_from_menu),
+      observer_(nullptr) {
   DCHECK_NE((step_ == translate::TRANSLATE_STEP_TRANSLATE_ERROR),
             (error_type_ == TranslateErrors::NONE));
   DCHECK(translate_manager_);
 }
 
 infobars::InfoBarDelegate::Type
 TranslateInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 int TranslateInfoBarDelegate::GetIconId() const {
   return translate_manager_->translate_client()->GetInfobarIconID();
 }
 
 void TranslateInfoBarDelegate::InfoBarDismissed() {
-  if (step_ != translate::TRANSLATE_STEP_BEFORE_TRANSLATE)
-    return;
-  if (IsCompactUIEnabled())
-    return;
-  // The user closed the infobar without clicking the translate button.
-  TranslationDeclined();
-  UMA_HISTOGRAM_BOOLEAN("Translate.DeclineTranslateCloseInfobar", true);
+  bool declined = observer_
+                      ? observer_->IsDeclinedByUser()
+                      : (step_ == translate::TRANSLATE_STEP_BEFORE_TRANSLATE);
+
+  if (declined) {
+    // The user closed the infobar without clicking the translate button.
+    TranslationDeclined();
+    UMA_HISTOGRAM_BOOLEAN("Translate.DeclineTranslateCloseInfobar", true);
+  }
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
 }  // namespace translate