Remove TabContents from TabStripModelObserverBridge.

chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

 // 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 "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "skia/ext/skia_utils_mac.h"
 
 // C++ class that receives INFOBAR_ADDED and INFOBAR_REMOVED
 // notifications and proxies them back to |controller|.
 class InfoBarNotificationObserver : public content::NotificationObserver {
  public:
   InfoBarNotificationObserver(InfoBarContainerController* controller)
@@ skipping 102 matching lines @@
   [self positionInfoBarsAndRedraw];
 }
 
 - (BrowserWindowController*)browserWindowController {
   id controller = [[[self view] window] windowController];
   if (![controller isKindOfClass:[BrowserWindowController class]])
     return nil;
   return controller;
 }
 
-- (void)changeTabContents:(TabContents*)contents {
+- (void)changeWebContents:(content::WebContents*)contents {
   registrar_.RemoveAll();
   [self removeAllInfoBars];
 
-  currentTabContents_ = contents;
-  if (currentTabContents_) {
+  currentWebContents_ = contents;
+  if (currentWebContents_) {
     InfoBarTabHelper* infobarTabHelper =
-        InfoBarTabHelper::FromWebContents(currentTabContents_->web_contents());
+        InfoBarTabHelper::FromWebContents(currentWebContents_);
     for (size_t i = 0; i < infobarTabHelper->GetInfoBarCount(); ++i) {
       InfoBar* infobar = infobarTabHelper->
           GetInfoBarDelegateAt(i)->CreateInfoBar(infobarTabHelper);
       [self addInfoBar:infobar animate:NO];
     }
 
     content::Source<InfoBarTabHelper> source(infobarTabHelper);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, source);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, source);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED, source);
   }
 
   [self positionInfoBarsAndRedraw];
 }
 
-- (void)tabDetachedWithContents:(TabContents*)contents {
-  if (currentTabContents_ == contents)
-    [self changeTabContents:NULL];
+- (void)tabDetachedWithContents:(content::WebContents*)contents {
+  if (currentWebContents_ == contents)
+    [self changeWebContents:NULL];
 }
 
 - (NSUInteger)infobarCount {
   return [infobarControllers_ count] - [closingInfoBars_ count];
 }
 
 - (CGFloat)overlappingTipHeight {
   return [self infobarCount] ? infobars::kTipHeight : 0;
 }
 
@@ skipping 91 matching lines @@
     frame.size.width = NSWidth(containerBounds);
     [view setFrame:frame];
 
     minY += NSHeight(frame) - infobars::kTipHeight;
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end