Move infobar handling to a tab helper.

chrome/browser/ui/browser_init.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_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/automation/testing_automation_provider.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/pepper_flash_component_installer.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 208 matching lines @@
 }
 
 void NotifyNotDefaultBrowserTask::Run() {
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return;  // Reached during ui tests.
   // Don't show the info-bar if there are already info-bars showing.
   // In ChromeBot tests, there might be a race. This line appears to get
   // called during shutdown and |tab| can be NULL.
   TabContentsWrapper* tab = browser->GetSelectedTabContentsWrapper();
-  if (!tab || tab->infobar_count() > 0)
+  if (!tab || tab->infobar_tab_helper()->infobar_count() > 0)
     return;
-  tab->AddInfoBar(new DefaultBrowserInfoBarDelegate(tab->tab_contents()));
+  tab->infobar_tab_helper()->AddInfoBar(
+      new DefaultBrowserInfoBarDelegate(tab->tab_contents()));
 }
 
 
 // CheckDefaultBrowserTask ----------------------------------------------------
 
 class CheckDefaultBrowserTask : public Task {
  public:
   CheckDefaultBrowserTask();
   virtual ~CheckDefaultBrowserTask();
 
@@ skipping 807 matching lines @@
 
 void BrowserInit::LaunchWithProfile::AddCrashedInfoBarIfNecessary(
     Browser* browser,
     TabContentsWrapper* tab) {
   // Assume that if the user is launching incognito they were previously
   // running incognito so that we have nothing to restore from.
   if (!profile_->DidLastSessionExitCleanly() && !profile_->IsOffTheRecord()) {
     // The last session didn't exit cleanly. Show an infobar to the user
     // so that they can restore if they want. The delegate deletes itself when
     // it is closed.
-    tab->AddInfoBar(
+    tab->infobar_tab_helper()->AddInfoBar(
         new SessionCrashedInfoBarDelegate(profile_, tab->tab_contents()));
   }
 }
 
 void BrowserInit::LaunchWithProfile::AddBadFlagsInfoBarIfNecessary(
     TabContentsWrapper* tab) {
   // Unsupported flags for which to display a warning that "stability and
   // security will suffer".
   static const char* kBadFlags[] = {
     // These imply disabling the sandbox.
     switches::kSingleProcess,
     switches::kNoSandbox,
     switches::kInProcessWebGL,
     NULL
   };
 
   const char* bad_flag = NULL;
   for (const char** flag = kBadFlags; *flag; ++flag) {
     if (command_line_.HasSwitch(*flag)) {
       bad_flag = *flag;
       break;
     }
   }
 
   if (bad_flag) {
-    tab->AddInfoBar(new SimpleAlertInfoBarDelegate(tab->tab_contents(), NULL,
-        l10n_util::GetStringFUTF16(IDS_BAD_FLAGS_WARNING_MESSAGE,
-                                   UTF8ToUTF16(std::string("--") + bad_flag)),
-        false));
+    tab->infobar_tab_helper()->AddInfoBar(
+        new SimpleAlertInfoBarDelegate(
+            tab->tab_contents(), NULL,
+            l10n_util::GetStringFUTF16(
+                IDS_BAD_FLAGS_WARNING_MESSAGE,
+                UTF8ToUTF16(std::string("--") + bad_flag)),
+            false));
   }
 }
 
 class LearnMoreInfoBar : public LinkInfoBarDelegate {
  public:
   LearnMoreInfoBar(TabContents* tab_contents,
                    const string16& message,
                    const GURL& url);
   virtual ~LearnMoreInfoBar();
 
@@ skipping 43 matching lines @@
 void BrowserInit::LaunchWithProfile::
     AddDNSCertProvenanceCheckingWarningInfoBarIfNecessary(
         TabContentsWrapper* tab) {
   if (!command_line_.HasSwitch(switches::kEnableDNSCertProvenanceChecking))
     return;
 
   const char* kLearnMoreURL =
       "http://dev.chromium.org/dnscertprovenancechecking";
   string16 message = l10n_util::GetStringUTF16(
       IDS_DNS_CERT_PROVENANCE_CHECKING_WARNING_MESSAGE);
-  tab->AddInfoBar(new LearnMoreInfoBar(tab->tab_contents(),
-                                       message,
-                                       GURL(kLearnMoreURL)));
+  tab->infobar_tab_helper()->AddInfoBar(
+      new LearnMoreInfoBar(tab->tab_contents(),
+                           message,
+                           GURL(kLearnMoreURL)));
 }
 
 void BrowserInit::LaunchWithProfile::AddObsoleteSystemInfoBarIfNecessary(
     TabContentsWrapper* tab) {
 #if defined(TOOLKIT_USES_GTK)
   // We've deprecated support for Ubuntu Hardy.  Rather than attempting to
   // determine whether you're using that, we instead key off the GTK version;
   // this will also deprecate other distributions (including variants of Ubuntu)
   // that are of a similar age.
   // Version key:
   //   Ubuntu Hardy: GTK 2.12
   //   RHEL 6:       GTK 2.18
   //   Ubuntu Lucid: GTK 2.20
   if (gtk_check_version(2, 18, 0)) {
     string16 message =
         l10n_util::GetStringFUTF16(IDS_SYSTEM_OBSOLETE_MESSAGE,
                                    l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
     // Link to an article in the help center on minimum system requirements.
     const char* kLearnMoreURL =
         "http://www.google.com/support/chrome/bin/answer.py?answer=95411";
-    tab->AddInfoBar(new LearnMoreInfoBar(tab->tab_contents(),
-                                         message,
-                                         GURL(kLearnMoreURL)));
+    tab->infobar_tab_helper()->AddInfoBar(
+        new LearnMoreInfoBar(tab->tab_contents(),
+                             message,
+                             GURL(kLearnMoreURL)));
   }
 #endif
 }
 
 void BrowserInit::LaunchWithProfile::AddStartupURLs(
     std::vector<GURL>* startup_urls) const {
   // If we have urls specified beforehand (i.e. from command line) use them
   // and nothing else.
   if (!startup_urls->empty())
     return;
@@ skipping 258 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }