Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6361)

Unified Diff: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 12 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm (revision 116109)
+++ chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm (working copy)
@@ -15,6 +15,8 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
+using content::WebContents;
+
@interface TabContentsController(Private)
// Forwards frame update to |delegate_| (ResizeNotificationView calls it).
- (void)tabContentsViewFrameWillChange:(NSRect)frameRect;
@@ -35,7 +37,7 @@
const content::NotificationSource& source,
const content::NotificationDetails& details);
// Register for |contents|'s notifications, remove all prior registrations.
- void ChangeTabContents(TabContents* contents);
+ void ChangeWebContents(WebContents* contents);
private:
content::NotificationRegistrar registrar_;
TabContentsController* controller_; // weak, owns us
@@ -60,7 +62,7 @@
}
}
-void TabContentsNotificationBridge::ChangeTabContents(TabContents* contents) {
+void TabContentsNotificationBridge::ChangeWebContents(WebContents* contents) {
registrar_.RemoveAll();
if (contents) {
registrar_.Add(
@@ -105,7 +107,7 @@
contents_ = contents;
delegate_ = delegate;
tabContentsBridge_.reset(new TabContentsNotificationBridge(self));
- tabContentsBridge_->ChangeTabContents(contents);
+ tabContentsBridge_->ChangeWebContents(contents);
}
return self;
}
@@ -164,7 +166,7 @@
- (void)changeTabContents:(TabContents*)newContents {
contents_ = newContents;
- tabContentsBridge_->ChangeTabContents(contents_);
+ tabContentsBridge_->ChangeWebContents(contents_);
}
- (void)tabContentsViewFrameWillChange:(NSRect)frameRect {
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h ('k') | chrome/browser/ui/cocoa/tabpose_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698