| 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 93b0b5d87b839e5ae9d1e06412815c8472f991d5..64428aa18074a9b835de5e0c1b294aff6b619264 100644
|
| --- a/chrome/browser/ui/cocoa/constrained_window_mac.h
|
| +++ b/chrome/browser/ui/cocoa/constrained_window_mac.h
|
| @@ -18,7 +18,6 @@
|
| @class NSView;
|
| @class NSWindow;
|
| class TabContents;
|
| -typedef TabContents TabContentsWrapper;
|
|
|
| // Base class for constrained dialog delegates. Never inherit from this
|
| // directly.
|
| @@ -111,7 +110,7 @@ class ConstrainedWindowMacDelegateCustomSheet
|
| // deleted.
|
| class ConstrainedWindowMac : public ConstrainedWindow {
|
| public:
|
| - ConstrainedWindowMac(TabContentsWrapper* wrapper,
|
| + ConstrainedWindowMac(TabContents* tab_contents,
|
| ConstrainedWindowMacDelegate* delegate);
|
| virtual ~ConstrainedWindowMac();
|
|
|
| @@ -119,8 +118,8 @@ class ConstrainedWindowMac : public ConstrainedWindow {
|
| virtual void ShowConstrainedWindow() OVERRIDE;
|
| virtual void CloseConstrainedWindow() OVERRIDE;
|
|
|
| - // Returns the TabContentsWrapper that constrains this Constrained Window.
|
| - TabContentsWrapper* owner() const { return wrapper_; }
|
| + // Returns the TabContents that constrains this Constrained Window.
|
| + TabContents* owner() const { return tab_contents_; }
|
|
|
| // Returns the window's delegate.
|
| ConstrainedWindowMacDelegate* delegate() { return delegate_; }
|
| @@ -131,8 +130,8 @@ class ConstrainedWindowMac : public ConstrainedWindow {
|
| private:
|
| friend class ConstrainedWindow;
|
|
|
| - // The TabContentsWrapper that owns and constrains this ConstrainedWindow.
|
| - TabContentsWrapper* wrapper_;
|
| + // The TabContents that owns and constrains this ConstrainedWindow.
|
| + TabContents* tab_contents_;
|
|
|
| // Delegate that provides the contents of this constrained window.
|
| ConstrainedWindowMacDelegate* delegate_;
|
|
|