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

Unified Diff: chrome/browser/ui/cocoa/constrained_window_mac.h

Issue 11111022: Remove TabContents from constrained windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unrelated gtk code Created 8 years, 2 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.h
diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window_mac.h
index 6e4a15188670161ffed0f237d1d1e09d0f8d330f..6ccee8ddaf4f6038a1a7a731c080695f627dfb80 100644
--- a/chrome/browser/ui/cocoa/constrained_window_mac.h
+++ b/chrome/browser/ui/cocoa/constrained_window_mac.h
@@ -16,7 +16,10 @@ class ConstrainedWindowMac;
@class GTMWindowSheetController;
@class NSView;
@class NSWindow;
-class TabContents;
+
+namespace content {
+class WebContents;
+}
// Window controllers that allow hosting constrained windows should
// implement this protocol.
@@ -117,7 +120,7 @@ class ConstrainedWindowMacDelegateCustomSheet
// deleted.
class ConstrainedWindowMac : public ConstrainedWindow {
public:
- ConstrainedWindowMac(TabContents* tab_contents,
+ ConstrainedWindowMac(content::WebContents* web_contents,
ConstrainedWindowMacDelegate* delegate);
virtual ~ConstrainedWindowMac();
@@ -126,8 +129,8 @@ class ConstrainedWindowMac : public ConstrainedWindow {
virtual void CloseConstrainedWindow() OVERRIDE;
virtual bool CanShowConstrainedWindow() OVERRIDE;
- // Returns the TabContents that constrains this Constrained Window.
- TabContents* owner() const { return tab_contents_; }
+ // Returns the WebContents that constrains this Constrained Window.
+ content::WebContents* owner() const { return web_contents_; }
// Returns the window's delegate.
ConstrainedWindowMacDelegate* delegate() { return delegate_; }
@@ -138,8 +141,8 @@ class ConstrainedWindowMac : public ConstrainedWindow {
private:
friend class ConstrainedWindow;
- // The TabContents that owns and constrains this ConstrainedWindow.
- TabContents* tab_contents_;
+ // The WebContents that owns and constrains this ConstrainedWindow.
+ content::WebContents* web_contents_;
// Delegate that provides the contents of this constrained window.
ConstrainedWindowMacDelegate* delegate_;

Powered by Google App Engine
This is Rietveld 408576698