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

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

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac compile (add forward declaration to file that didn't have it) Created 9 years, 3 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 4f8fc55334b3d99c1b570d4a93e7cbb8b6a0cf02..75c949a46f4b3488fce1f5517bd109f88b9454fa 100644
--- a/chrome/browser/ui/cocoa/constrained_window_mac.h
+++ b/chrome/browser/ui/cocoa/constrained_window_mac.h
@@ -18,7 +18,7 @@
@class GTMWindowSheetController;
@class NSView;
@class NSWindow;
-class TabContents;
+class TabContentsWrapper;
// Base class for constrained dialog delegates. Never inherit from this
// directly.
@@ -109,7 +109,7 @@ class ConstrainedWindowMacDelegateCustomSheet
// deleted.
class ConstrainedWindowMac : public ConstrainedWindow {
public:
- ConstrainedWindowMac(TabContents* owner,
+ ConstrainedWindowMac(TabContentsWrapper* wrapper,
ConstrainedWindowMacDelegate* delegate);
virtual ~ConstrainedWindowMac();
@@ -117,8 +117,8 @@ class ConstrainedWindowMac : public ConstrainedWindow {
virtual void ShowConstrainedWindow();
virtual void CloseConstrainedWindow();
- // Returns the TabContents that constrains this Constrained Window.
- TabContents* owner() const { return owner_; }
+ // Returns the TabContentsWrapper that constrains this Constrained Window.
+ TabContentsWrapper* owner() const { return wrapper_; }
// Returns the window's delegate.
ConstrainedWindowMacDelegate* delegate() { return delegate_; }
@@ -129,8 +129,8 @@ class ConstrainedWindowMac : public ConstrainedWindow {
private:
friend class ConstrainedWindow;
- // The TabContents that owns and constrains this ConstrainedWindow.
- TabContents* owner_;
+ // The TabContentsWrapper that owns and constrains this ConstrainedWindow.
+ TabContentsWrapper* wrapper_;
// Delegate that provides the contents of this constrained window.
ConstrainedWindowMacDelegate* delegate_;
« no previous file with comments | « chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm ('k') | chrome/browser/ui/cocoa/constrained_window_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698