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

Unified Diff: chrome/browser/ui/cocoa/constrained_window_mac.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/constrained_window_mac.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window_mac.mm
index 5df9b85eb73acc9565279ef6c9b4cfdcbb496a0f..1d018f160838b2dc24cbd176e3f4a787908aaef2 100644
--- a/chrome/browser/ui/cocoa/constrained_window_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_window_mac.mm
@@ -6,7 +6,7 @@
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/browser/ui/constrained_window_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#import "third_party/GTM/AppKit/GTMWindowSheetController.h"
@@ -86,16 +86,16 @@ void ConstrainedWindowMacDelegateCustomSheet::RunSheet(
}
ConstrainedWindowMac::ConstrainedWindowMac(
- TabContentsWrapper* wrapper, ConstrainedWindowMacDelegate* delegate)
- : wrapper_(wrapper),
+ TabContents* tab_contents, ConstrainedWindowMacDelegate* delegate)
+ : tab_contents_(tab_contents),
delegate_(delegate),
controller_(nil),
should_be_visible_(false),
closing_(false) {
- DCHECK(wrapper);
+ DCHECK(tab_contents);
DCHECK(delegate);
- wrapper->constrained_window_tab_helper()->AddConstrainedDialog(this);
+ tab_contents->constrained_window_tab_helper()->AddConstrainedDialog(this);
}
ConstrainedWindowMac::~ConstrainedWindowMac() {}
@@ -106,7 +106,7 @@ void ConstrainedWindowMac::ShowConstrainedWindow() {
// this case, open the sheet now. Else, Realize() will be called later, when
// our tab becomes visible.
NSWindow* browserWindow =
- wrapper_->web_contents()->GetView()->GetTopLevelNativeWindow();
+ tab_contents_->web_contents()->GetView()->GetTopLevelNativeWindow();
BrowserWindowController* browser_controller =
[BrowserWindowController browserWindowControllerForWindow:browserWindow];
if ([browser_controller canAttachConstrainedWindow])
@@ -126,7 +126,7 @@ void ConstrainedWindowMac::CloseConstrainedWindow() {
// ok.
[controller_ removeConstrainedWindow:this];
delegate_->DeleteDelegate();
- wrapper_->constrained_window_tab_helper()->WillClose(this);
+ tab_contents_->constrained_window_tab_helper()->WillClose(this);
delete this;
}
« no previous file with comments | « chrome/browser/ui/cocoa/constrained_window_mac.h ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698