content: Move constrained window code from TabContents to TabContentsWrapper

chrome/browser/ui/cocoa/constrained_window_mac.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
 #include "content/browser/tab_contents/constrained_window.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
 
 @class BrowserWindowController;
 @class GTMWindowSheetController;
 @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.
 class ConstrainedWindowMacDelegate {
  public:
   ConstrainedWindowMacDelegate() : is_sheet_open_(false) {}
   virtual ~ConstrainedWindowMacDelegate() {}
 
   // Tells the delegate to either delete itself or set up a task to delete
   // itself later. Note that you MUST close the sheet belonging to your delegate
@@ skipping 70 matching lines @@
 // Constrained window implementation for the Mac port. A constrained window
 // is a per-tab sheet on OS X.
 //
 // Constrained windows work slightly differently on OS X than on the other
 // platforms:
 // 1. A constrained window is bound to both a tab and window on OS X.
 // 2. The delegate is responsible for closing the sheet again when it is
 //    deleted.
 class ConstrainedWindowMac : public ConstrainedWindow {
  public:
-  ConstrainedWindowMac(TabContents* owner,
+  ConstrainedWindowMac(TabContentsWrapper* wrapper,
                        ConstrainedWindowMacDelegate* delegate);
   virtual ~ConstrainedWindowMac();
 
   // Overridden from ConstrainedWindow:
   virtual void ShowConstrainedWindow();
   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_; }
 
   // Makes the constrained window visible, if it is not yet visible.
   void Realize(BrowserWindowController* controller);
 
  private:
   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_;
 
   // Controller of the window that contains this sheet.
   BrowserWindowController* controller_;
 
   // Stores if |ShowConstrainedWindow()| was called.
   bool should_be_visible_;
 
   // True when CloseConstrainedWindow has been called.
   bool closing_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_