Move infobar handling to a tab helper.

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 33 matching lines @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
 #include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
@@ skipping 2355 matching lines @@
   file_select_helper->EnumerateDirectory(request_id,
                                          tab->render_view_host(),
                                          path);
 }
 
 // static
 void Browser::JSOutOfMemoryHelper(TabContents* tab) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
       tab);
   if (tcw) {
-    tcw->AddInfoBar(new SimpleAlertInfoBarDelegate(
+    tcw->infobar_tab_helper()->AddInfoBar(new SimpleAlertInfoBarDelegate(
         tab, NULL, l10n_util::GetStringUTF16(IDS_JS_OUT_OF_MEMORY_PROMPT),
         true));
   }
 }
 
 // static
 void Browser::RegisterProtocolHandlerHelper(TabContents* tab,
                                             const std::string& protocol,
                                             const GURL& url,
                                             const string16& title) {
@@ skipping 13 matching lines @@
   ProtocolHandlerRegistry* registry =
       tcw->profile()->GetProtocolHandlerRegistry();
   if (!registry->enabled() || registry->IsRegistered(handler) ||
       registry->IsIgnored(handler))
     return;
 
   if (!handler.IsEmpty() &&
       registry->CanSchemeBeOverridden(handler.protocol())) {
     UserMetrics::RecordAction(
         UserMetricsAction("RegisterProtocolHandler.InfoBar_Shown"));
-    tcw->AddInfoBar(new RegisterProtocolHandlerInfoBarDelegate(tab,
-                                                               registry,
-                                                               handler));
+    tcw->infobar_tab_helper()->AddInfoBar(
+        new RegisterProtocolHandlerInfoBarDelegate(tab, registry, handler));
   }
 }
 
 // static
 void Browser::RegisterIntentHandlerHelper(TabContents* tab,
                                           const string16& action,
                                           const string16& type,
                                           const string16& href,
                                           const string16& title) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
       tab);
   if (!tcw || tcw->profile()->IsOffTheRecord())
     return;
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
     return;
 
   GURL service_url(href);
   if (!service_url.is_valid()) {
     const GURL& url = tab->GetURL();
     service_url = url.Resolve(href);
   }
 
   WebIntentData intent;
   intent.service_url = service_url;
   intent.action = action;
   intent.type = type;
   intent.title = title;
-  tcw->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate(tab, intent));
+  tcw->infobar_tab_helper()->AddInfoBar(
+      new RegisterIntentHandlerInfoBarDelegate(tab, intent));
 }
 
 // static
 void Browser::WebIntentDispatchHelper(TabContents* tab,
                                       int routing_id,
                                       const string16& action,
                                       const string16& type,
                                       const string16& data,
                                       int intent_id) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
@@ skipping 1182 matching lines @@
 
 void Browser::RendererUnresponsive(TabContents* source) {
   browser::ShowHungRendererDialog(source);
 }
 
 void Browser::RendererResponsive(TabContents* source) {
   browser::HideHungRendererDialog(source);
 }
 
 void Browser::WorkerCrashed(TabContents* source) {
   TabContentsWrapper* wrapper =

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

Nit: Collapse these two lines together

       TabContentsWrapper::GetCurrentWrapperForContents(source);
-  wrapper->AddInfoBar(new SimpleAlertInfoBarDelegate(
+  wrapper->infobar_tab_helper()->AddInfoBar(new SimpleAlertInfoBarDelegate(
       source, NULL, l10n_util::GetStringUTF16(IDS_WEBWORKER_CRASHED_PROMPT),
       true));
 }
 
 void Browser::DidNavigateMainFramePostCommit(TabContents* tab) {
   if (tab == GetSelectedTabContents())
     UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
 }
 
 void Browser::DidNavigateToPendingEntry(TabContents* tab) {
@@ skipping 1410 matching lines @@
 }
 
 void Browser::ShowSyncSetup() {
   ProfileSyncService* service =
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }