chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm - Issue 10534093: TabContentsWrapper -> TabContents, part 37.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

index 7288784d48cca9ae694d7a06b4078efe68f55f72..3770270b61cc5b2fdde2b5b6d440d15158d1ea4a 100644

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

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

@@ -13,7 +13,7 @@

#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_wrapper.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"

@@ -136,7 +136,7 @@ class InfoBarNotificationObserver : public content::NotificationObserver {

return controller;

}

-- (void)changeTabContents:(TabContentsWrapper*)contents {

+- (void)changeTabContents:(TabContents*)contents {

registrar_.RemoveAll();

[self removeAllInfoBars];

@@ -162,7 +162,7 @@ class InfoBarNotificationObserver : public content::NotificationObserver {

[self positionInfoBarsAndRedraw];

}

-- (void)tabDetachedWithContents:(TabContentsWrapper*)contents {

+- (void)tabDetachedWithContents:(TabContents*)contents {

if (currentTabContents_ == contents)

[self changeTabContents:NULL];

}