| Index: chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
|
| index c881dabaf66667226e96f8f84540ce7906534e90..d6e4d0a9f1fcba3d3cd117e85e2b8851e753cc00 100644
|
| --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
|
| +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
|
| @@ -19,7 +19,6 @@ class InfoBar;
|
| class InfoBarDelegate;
|
| class InfoBarNotificationObserver;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
| class TabStripModel;
|
|
|
| // Protocol for basic container methods, as needed by an InfoBarController.
|
| @@ -53,8 +52,8 @@ const CGFloat kTipHeight = 12.0;
|
| // Needed to send resize messages when infobars are added or removed.
|
| id<ViewResizer> resizeDelegate_; // weak
|
|
|
| - // The TabContentsWrapper we are currently showing infobars for.
|
| - TabContentsWrapper* currentTabContents_; // weak
|
| + // The TabContents we are currently showing infobars for.
|
| + TabContents* currentTabContents_; // weak
|
|
|
| // Holds the InfoBarControllers currently owned by this container.
|
| scoped_nsobject<NSMutableArray> infobarControllers_;
|
| @@ -87,12 +86,12 @@ const CGFloat kTipHeight = 12.0;
|
| // infobars, removes them first and deregisters for any
|
| // notifications. |contents| can be NULL, in which case no infobars
|
| // are shown and no notifications are registered for.
|
| -- (void)changeTabContents:(TabContentsWrapper*)contents;
|
| +- (void)changeTabContents:(TabContents*)contents;
|
|
|
| // Stripped down version of TabStripModelObserverBridge:tabDetachedWithContents.
|
| // Forwarded by BWC. Removes all infobars and deregisters for any notifications
|
| // if |contents| is the current tab contents.
|
| -- (void)tabDetachedWithContents:(TabContentsWrapper*)contents;
|
| +- (void)tabDetachedWithContents:(TabContents*)contents;
|
|
|
| // Returns the number of active infobars. This is
|
| // |infobarControllers_ - closingInfoBars_|.
|
|
|