Move infobar handling to a tab helper.

chrome/browser/ui/tab_contents/tab_contents_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 class BookmarkTabHelper;
 class DownloadRequestLimiterObserver;
 class Extension;
 class ExtensionTabHelper;
 class ExtensionWebNavigationTabObserver;
 class ExternalProtocolObserver;
 class FaviconTabHelper;
 class FileSelectObserver;
 class FindTabHelper;
 class FirewallTraversalTabHelper;
-class InfoBarDelegate;
+class InfoBarTabHelper;
 class HistoryTabHelper;
 class NavigationController;
 class OmniboxSearchHint;
 class PasswordManager;
 class PasswordManagerDelegate;
 class PluginObserver;
 class RestoreTabHelper;
 class SearchEngineTabHelper;
 class TabContentsSSLHelper;
 class TabContentsWrapperDelegate;
@@ skipping 31 matching lines @@
   // Returns a human-readable description the tab's loading state.
   string16 GetStatusText() const;
 
   // Create a TabContentsWrapper with the same state as this one. The returned
   // heap-allocated pointer is owned by the caller.
   TabContentsWrapper* Clone();
 
   // Captures a snapshot of the page.
   void CaptureSnapshot();
 
+  // Stop this tab rendering in fullscreen mode.
+  void ExitFullscreenMode();
+
   // Helper to retrieve the existing instance that wraps a given TabContents.
   // Returns NULL if there is no such existing instance.
   // NOTE: This is not intended for general use. It is intended for situations
   // like callbacks from content/ where only a TabContents is available. In the
   // general case, please do NOT use this; plumb TabContentsWrapper through the
   // chrome/ code instead of TabContents.
   static TabContentsWrapper* GetCurrentWrapperForContents(
       TabContents* contents);
   static const TabContentsWrapper* GetCurrentWrapperForContents(
       const TabContents* contents);
@@ skipping 43 matching lines @@
   }
 
   const ExtensionTabHelper* extension_tab_helper() const {
     return extension_tab_helper_.get();
   }
 
   FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
 
   FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
   HistoryTabHelper* history_tab_helper() { return history_tab_helper_.get(); }
+  InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); }
   PasswordManager* password_manager() { return password_manager_.get(); }
 
   printing::PrintViewManager* print_view_manager() {
     return print_view_manager_.get();
   }
 
   safe_browsing::ClientSideDetectionHost* safebrowsing_detection_host() {
     return safebrowsing_detection_host_.get();
   }
 
@@ skipping 30 matching lines @@
   virtual void RenderViewGone() OVERRIDE;
   virtual void DidBecomeSelected() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
 
   // NotificationObserver overrides:
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
-  // Infobars ------------------------------------------------------------------
-
-  // Adds an InfoBar for the specified |delegate|.
-  //
-  // If infobars are disabled for this tab or the tab already has a delegate
-  // which returns true for InfoBarDelegate::EqualsDelegate(delegate),
-  // |delegate| is closed immediately without being added.
-  void AddInfoBar(InfoBarDelegate* delegate);
-
-  // Removes the InfoBar for the specified |delegate|.
-  //
-  // If infobars are disabled for this tab, this will do nothing, on the
-  // assumption that the matching AddInfoBar() call will have already closed the
-  // delegate (see above).
-  void RemoveInfoBar(InfoBarDelegate* delegate);
-
-  // Replaces one infobar with another, without any animation in between.
-  //
-  // If infobars are disabled for this tab, |new_delegate| is closed immediately
-  // without being added, and nothing else happens.
-  //
-  // NOTE: This does not perform any EqualsDelegate() checks like AddInfoBar().
-  void ReplaceInfoBar(InfoBarDelegate* old_delegate,
-                      InfoBarDelegate* new_delegate);
-
-  // Enumeration and access functions.
-  size_t infobar_count() const { return infobars_.size(); }
-  // WARNING: This does not sanity-check |index|!
-  InfoBarDelegate* GetInfoBarDelegateAt(size_t index);
-  void set_infobars_enabled(bool value) { infobars_enabled_ = value; }
-
-  // Stop this tab rendering in fullscreen mode.
-  void ExitFullscreenMode();
-
  private:
   // Internal helpers ----------------------------------------------------------
 
   // Message handlers.
   void OnSnapshot(const SkBitmap& bitmap);
   void OnPDFHasUnsupportedFeature();
-  void OnDidBlockDisplayingInsecureContent();
-  void OnDidBlockRunningInsecureContent();
 
   // Returns the server that can provide alternate error pages.  If the returned
   // URL is empty, the default error page built into WebKit will be used.
   GURL GetAlternateErrorPageURL() const;
 
   // Send the alternate error page URL to the renderer.
   void UpdateAlternateErrorPageURL(RenderViewHost* rvh);
 
   // Update the RenderView's WebPreferences.
   void UpdateWebPreferences();
 
   // Update the TabContents's RendererPreferences.
   void UpdateRendererPreferences();
 
   // Create or destroy SafebrowsingDetectionHost as needed if the user's
   // safe browsing preference has changed.
   void UpdateSafebrowsingDetectionHost();
 
-  void RemoveInfoBarInternal(InfoBarDelegate* delegate, bool animate);
-  void RemoveAllInfoBars(bool animate);
-
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   TabContentsWrapperDelegate* delegate_;
 
-  // Delegates for InfoBars associated with this TabContentsWrapper.
-  std::vector<InfoBarDelegate*> infobars_;
-  bool infobars_enabled_;
-
   NotificationRegistrar registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 
   // Helper which implements the SyncedTabDelegate interface.
   scoped_ptr<TabContentsWrapperSyncedTabDelegate> synced_tab_delegate_;
 
   // Data for current page -----------------------------------------------------
 
   // Shows an info-bar to users when they search from a known search engine and
   // have never used the omnibox for search before.
   scoped_ptr<OmniboxSearchHint> omnibox_search_hint_;
 
   // Tab Helpers ---------------------------------------------------------------
   // (These provide API for callers and have a getter function listed in the
   // "Tab Helpers" section in the member functions area, above.)
 
   scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
   scoped_ptr<AutofillManager> autofill_manager_;
   scoped_ptr<AutomationTabHelper> automation_tab_helper_;
   scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
   scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
   scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
   scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
   scoped_ptr<FindTabHelper> find_tab_helper_;
   scoped_ptr<FirewallTraversalTabHelper> firewall_traversal_tab_helper_;
   scoped_ptr<HistoryTabHelper> history_tab_helper_;
+  scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
   scoped_ptr<RestoreTabHelper> restore_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
 
   // Handles print job for this contents.
   scoped_ptr<printing::PrintViewManager> print_view_manager_;
 
@@ skipping 29 matching lines @@
 
   // The supporting objects need to outlive the TabContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<TabContents> tab_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_