Infobar Componentization Proof of Concept

chrome/browser/translate/translate_infobar_delegate.cc

 // Copyright (c) 2012 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 "chrome/browser/translate/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/common/translate_constants.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 58 matching lines @@
         TranslateTabHelper::FromWebContents(web_contents);
     if (!translate_tab_helper ||
         translate_tab_helper->GetLanguageState().InTranslateNavigation())
       return;
   }
 
   // Find any existing translate infobar delegate.
   InfoBar* old_infobar = NULL;
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
+  InfoBarManager& infobar_manager = infobar_service->infobar_manager();
   TranslateInfoBarDelegate* old_delegate = NULL;
-  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
-    old_infobar = infobar_service->infobar_at(i);
+  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)
         return;
       break;
     }
   }
 
   // Add the new delegate.
   scoped_ptr<InfoBar> infobar(CreateInfoBar(
@@ skipping 22 matching lines @@
   ui_delegate_.Translate();
 }
 
 void TranslateInfoBarDelegate::RevertTranslation() {
   ui_delegate_.RevertTranslation();
   infobar()->RemoveSelf();
 }
 
 void TranslateInfoBarDelegate::ReportLanguageDetectionError() {
   TranslateManager* manager =
-      TranslateTabHelper::GetManagerFromWebContents(web_contents());
+      TranslateTabHelper::GetManagerFromWebContents(web_contents_);
   if (!manager)
     return;
   manager->ReportLanguageDetectionError();
 }
 
 void TranslateInfoBarDelegate::TranslationDeclined() {
   ui_delegate_.TranslationDeclined(false);
 }
 
 bool TranslateInfoBarDelegate::IsTranslatableLanguageByPrefs() {
   Profile* profile =
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   Profile* original_profile = profile->GetOriginalProfile();
   scoped_ptr<TranslatePrefs> translate_prefs(
       TranslateTabHelper::CreateTranslatePrefs(original_profile->GetPrefs()));
   TranslateAcceptLanguages* accept_languages =
       TranslateTabHelper::GetTranslateAcceptLanguages(original_profile);
   return translate_prefs->CanTranslateLanguage(accept_languages,
                                                original_language_code());
 }
 
 void TranslateInfoBarDelegate::ToggleTranslatableLanguageByPrefs() {
@@ skipping 89 matching lines @@
 }
 
 void TranslateInfoBarDelegate::MessageInfoBarButtonPressed() {
   DCHECK_EQ(TranslateTabHelper::TRANSLATE_ERROR, step_);
   if (error_type_ == TranslateErrors::UNSUPPORTED_LANGUAGE) {
     RevertTranslation();
     return;
   }
   // This is the "Try again..." case.
   TranslateManager* manager =
-      TranslateTabHelper::GetManagerFromWebContents(web_contents());
+      TranslateTabHelper::GetManagerFromWebContents(web_contents_);
   DCHECK(manager);
   manager->TranslatePage(
       original_language_code(), target_language_code(), false);
 }
 
 bool TranslateInfoBarDelegate::ShouldShowMessageInfoBarButton() {
   return !GetMessageInfoBarButtonText().empty();
 }
 
 bool TranslateInfoBarDelegate::ShouldShowNeverTranslateShortcut() {
   DCHECK_EQ(TranslateTabHelper::BEFORE_TRANSLATE, step_);
-  return !web_contents()->GetBrowserContext()->IsOffTheRecord() &&
-      (prefs_->GetTranslationDeniedCount(original_language_code()) >=
+  return !web_contents_->GetBrowserContext()->IsOffTheRecord() &&
+         (prefs_->GetTranslationDeniedCount(original_language_code()) >=
           kNeverTranslateMinCount);
 }
 
 bool TranslateInfoBarDelegate::ShouldShowAlwaysTranslateShortcut() {
   DCHECK_EQ(TranslateTabHelper::BEFORE_TRANSLATE, step_);
-  return !web_contents()->GetBrowserContext()->IsOffTheRecord() &&
-      (prefs_->GetTranslationAcceptedCount(original_language_code()) >=
+  return !web_contents_->GetBrowserContext()->IsOffTheRecord() &&
+         (prefs_->GetTranslationAcceptedCount(original_language_code()) >=
           kAlwaysTranslateMinCount);
 }
 
 // static
 base::string16 TranslateInfoBarDelegate::GetLanguageDisplayableName(
     const std::string& language_code) {
   return l10n_util::GetDisplayNameForLocale(
       language_code, g_browser_process->GetApplicationLocale(), true);
 }
 
@@ skipping 36 matching lines @@
     content::WebContents* web_contents,
     TranslateTabHelper::TranslateStep step,
     TranslateInfoBarDelegate* old_delegate,
     const std::string& original_language,
     const std::string& target_language,
     TranslateErrors::Type error_type,
     PrefService* prefs,
     bool triggered_from_menu)
     : InfoBarDelegate(),
       step_(step),
+      web_contents_(web_contents),
       background_animation_(NONE),
       ui_delegate_(web_contents, original_language, target_language),
       error_type_(error_type),
       prefs_(TranslateTabHelper::CreateTranslatePrefs(prefs)),
       triggered_from_menu_(triggered_from_menu) {
   DCHECK_NE((step_ == TranslateTabHelper::TRANSLATE_ERROR),
             (error_type_ == TranslateErrors::NONE));
 
   if (old_delegate && (old_delegate->is_error() != is_error()))
     background_animation_ = is_error() ? NORMAL_TO_ERROR : ERROR_TO_NORMAL;
@@ skipping 13 matching lines @@
 
 int TranslateInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_TRANSLATE;
 }
 
 InfoBarDelegate::Type TranslateInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 bool TranslateInfoBarDelegate::ShouldExpire(
-    const content::LoadCommittedDetails& details) const {
+    const NavigationDetails& details) const {
   // Note: we allow closing this infobar even if the main frame navigation
   // was programmatic and not initiated by the user - crbug.com/70261 .
-  if (!details.is_navigation_to_different_page() && !details.is_main_frame)
+  if (!details.is_navigation_to_different_page && !details.is_main_frame)
     return false;
 
   return InfoBarDelegate::ShouldExpireInternal(details);
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
+
+void TranslateInfoBarDelegate::CleanUp() { web_contents_ = NULL; }