Move infobar handling to a tab helper.

chrome/browser/extensions/extension_install_ui.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/extensions/extension_install_ui.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/simple_message_box.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 230 matching lines @@
   Browser* browser = BrowserList::FindTabbedBrowser(profile, true);
   if (!browser)
     return;
 
   TabContentsWrapper* tab_contents = browser->GetSelectedTabContentsWrapper();
   if (!tab_contents)
     return;
 
   // First find any previous theme preview infobars.
   InfoBarDelegate* old_delegate = NULL;
-  for (size_t i = 0; i < tab_contents->infobar_count(); ++i) {
-    InfoBarDelegate* delegate = tab_contents->GetInfoBarDelegateAt(i);
+  for (size_t i = 0;
+       i < tab_contents->infobar_tab_helper()->infobar_count();

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

Nit: Can you factor the infobar_tab_helper() out to a temp?

+       ++i) {
+    InfoBarDelegate* delegate =
+        tab_contents->infobar_tab_helper()->GetInfoBarDelegateAt(i);
     ThemeInstalledInfoBarDelegate* theme_infobar =
         delegate->AsThemePreviewInfobarDelegate();
     if (theme_infobar) {
       // If the user installed the same theme twice, ignore the second install
       // and keep the first install info bar, so that they can easily undo to
       // get back the previous theme.
       if (theme_infobar->MatchesTheme(new_theme))
         return;
       old_delegate = delegate;
       break;
     }
   }
 
   // Then either replace that old one or add a new one.
   InfoBarDelegate* new_delegate = GetNewThemeInstalledInfoBarDelegate(
       tab_contents->tab_contents(), new_theme, previous_theme_id,
       previous_using_native_theme);
 
   if (old_delegate)
-    tab_contents->ReplaceInfoBar(old_delegate, new_delegate);
+    tab_contents->infobar_tab_helper()->ReplaceInfoBar(old_delegate,
+                                                       new_delegate);
   else
-    tab_contents->AddInfoBar(new_delegate);
+    tab_contents->infobar_tab_helper()->AddInfoBar(new_delegate);
 }
 
 void ExtensionInstallUI::ShowConfirmation(PromptType prompt_type) {
   // Load the image asynchronously. For the response, check OnImageLoaded.
   prompt_type_ = prompt_type;
   ExtensionResource image =
       extension_->GetIconResource(Extension::EXTENSION_ICON_LARGE,
                                   ExtensionIconSet::MATCH_EXACTLY);
   tracker_.LoadImage(extension_, image,
                      gfx::Size(kIconSize, kIconSize),
                      ImageLoadingTracker::DONT_CACHE);
 }
 
 InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate(
     TabContents* tab_contents,
     const Extension* new_theme,
     const std::string& previous_theme_id,
     bool previous_using_native_theme) {
   return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
                                            previous_theme_id,
                                            previous_using_native_theme);
 }