Move infobar handling to a tab helper.

chrome/browser/translate/translate_manager.cc

 // Copyright (c) 2011 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_manager.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/language_state.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 478 matching lines @@
 
   TranslateTabHelper* helper = wrapper->translate_tab_helper();
   std::string auto_translate_to = helper->language_state().AutoTranslateTo();
   if (!auto_translate_to.empty()) {
     // This page was navigated through a click from a translated page.
     TranslatePage(tab, language_code, auto_translate_to);
     return;
   }
 
   // Prompts the user if he/she wants the page translated.
-  wrapper->AddInfoBar(TranslateInfoBarDelegate::CreateDelegate(
-      TranslateInfoBarDelegate::BEFORE_TRANSLATE, tab, language_code,
-      target_lang));
+  wrapper->infobar_tab_helper()->AddInfoBar(
+      TranslateInfoBarDelegate::CreateDelegate(
+        TranslateInfoBarDelegate::BEFORE_TRANSLATE, tab, language_code,
+        target_lang));
 }
 
 void TranslateManager::InitiateTranslationPosted(
     int process_id, int render_id, const std::string& page_lang) {
   // The tab might have been closed.
   TabContents* tab = tab_util::GetTabContentsByID(process_id, render_id);
   if (!tab)
     return;
 
   TranslateTabHelper* helper = TabContentsWrapper::GetCurrentWrapperForContents(
@@ skipping 228 matching lines @@
                                    TranslateInfoBarDelegate* infobar) {
   DCHECK(infobar != NULL);
   TranslateInfoBarDelegate* old_infobar = GetTranslateInfoBarDelegate(tab);
   infobar->UpdateBackgroundAnimation(old_infobar);
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
   if (!wrapper)
     return;
   if (old_infobar) {
     // There already is a translate infobar, simply replace it.
-    wrapper->ReplaceInfoBar(old_infobar, infobar);
+    wrapper->infobar_tab_helper()->ReplaceInfoBar(old_infobar, infobar);
   } else {
-    wrapper->AddInfoBar(infobar);
+    wrapper->infobar_tab_helper()->AddInfoBar(infobar);
   }
 }
 
 // static
 std::string TranslateManager::GetTargetLanguage(PrefService* prefs) {
   std::string ui_lang =
     GetLanguageCode(g_browser_process->GetApplicationLocale());
   if (IsSupportedLanguage(ui_lang))
     return ui_lang;
 
@@ skipping 16 matching lines @@
 }
 
 // static
 TranslateInfoBarDelegate* TranslateManager::GetTranslateInfoBarDelegate(
     TabContents* tab) {
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
   if (!wrapper)
     return NULL;
 
-  for (size_t i = 0; i < wrapper->infobar_count(); ++i) {
+  for (size_t i = 0; i < wrapper->infobar_tab_helper()->infobar_count(); ++i) {

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Factor this infobar_tab_helper() out to a temp

     TranslateInfoBarDelegate* delegate =
-        wrapper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
+        wrapper->infobar_tab_helper()->GetInfoBarDelegateAt(i)->
+            AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }
   return NULL;
 }