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

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: Attempt to fix views merge part 2 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..8550a8938d214bf386e362dbd09495704f0fd9dd 100644
--- a/chrome/browser/ui/cocoa/constrained_window_mac.h
+++ b/chrome/browser/ui/cocoa/constrained_window_mac.h
@@ -19,6 +19,7 @@
@class NSView;
@class NSWindow;
class TabContents;
Avi (use Gerrit) 2011/09/29 18:30:36 forward decl still needed?
+class TabContentsWrapper;
// Base class for constrained dialog delegates. Never inherit from this
// directly.
@@ -109,7 +110,7 @@ class ConstrainedWindowMacDelegateCustomSheet
// deleted.
class ConstrainedWindowMac : public ConstrainedWindow {
public:
- ConstrainedWindowMac(TabContents* owner,
+ ConstrainedWindowMac(TabContentsWrapper* wrapper,
ConstrainedWindowMacDelegate* delegate);
virtual ~ConstrainedWindowMac();
@@ -118,7 +119,7 @@ class ConstrainedWindowMac : public ConstrainedWindow {
virtual void CloseConstrainedWindow();
// Returns the TabContents that constrains this Constrained Window.
Avi (use Gerrit) 2011/09/29 18:30:36 update comment?
- TabContents* owner() const { return owner_; }
+ TabContentsWrapper* owner() const { return wrapper_; }
// Returns the window's delegate.
ConstrainedWindowMacDelegate* delegate() { return delegate_; }
@@ -130,7 +131,7 @@ class ConstrainedWindowMac : public ConstrainedWindow {
friend class ConstrainedWindow;
// The TabContents that owns and constrains this ConstrainedWindow.
Avi (use Gerrit) 2011/09/29 18:30:36 update comment?
- TabContents* owner_;
+ TabContentsWrapper* wrapper_;
// Delegate that provides the contents of this constrained window.
ConstrainedWindowMacDelegate* delegate_;

Powered by Google App Engine
This is Rietveld 408576698