This is r4523, with a few changes to make things work under Vista.

- Explicitly set_delegate(NULL) before releasing a TabContents. (I think
  the order messages are getting handled is different from XP; this only
  seems neccessary under Vista.)
- r4523 and someone elses change added entries to theme_resources.rc at
  roughly the same time, causing happy fun crashes.
- Roll in sgk's SConscript fix.

Review URL: http://codereview.chromium.org/9373

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4799 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 71 deletions

diff --git a/chrome/browser/constrained_window.h b/chrome/browser/constrained_window.h
index 04c0af9..d703ad2 100644
--- a/chrome/browser/constrained_window.h
+++ b/chrome/browser/constrained_window.h
@@ -21,53 +21,6 @@ class GURL;
 class TabContents;
 
 ///////////////////////////////////////////////////////////////////////////////
-// ConstrainedTabContentsDelegate
-//
-//  An object that implements this interface is managing one or more
-//  constrained windows. This interface is used to inform the delegate about
-//  events within the Constrained Window.
-//
-class ConstrainedTabContentsDelegate {
- public:
-  // Called when the contained TabContents creates a new TabContents.  The
-  // ConstrainedWindow has no way to present the new TabContents, so it just
-  // lets the delegate decide what to do.
-  virtual void AddNewContents(ConstrainedWindow* window,
-                              TabContents* new_contents,
-                              WindowOpenDisposition disposition,
-                              const gfx::Rect& initial_pos,
-                              bool user_gesture) = 0;
-
-  // Called to open a URL in a the specified manner.
-  virtual void OpenURL(ConstrainedWindow* window,
-                       const GURL& url,
-                       const GURL& referrer,
-                       WindowOpenDisposition disposition,
-                       PageTransition::Type transition) = 0;
-
-  // Called when the window is about to be closed.
-  virtual void WillClose(ConstrainedWindow* window) = 0;
-
-  // Called when the window's contents should be detached into a top-level
-  // window.  The delegate is expected to have re-parented the TabContents by
-  // the time this method returns.
-  // |contents_bounds| is the bounds of the TabContents after the detach
-  // action. These are in screen coordinates and are for the TabContents _only_
-  // - the window UI should be created around it at an appropriate size.
-  // |mouse_pt| is the position of the cursor in screen coordinates.
-  // |frame_component| is the part of the constrained window frame that
-  // corresponds to |mouse_pt| as returned by WM_NCHITTEST.
-  virtual void DetachContents(ConstrainedWindow* window,
-                              TabContents* contents,
-                              const gfx::Rect& contents_bounds,
-                              const gfx::Point& mouse_pt,
-                              int frame_component) = 0;
-
-  // Called when the window is moved or resized.
-  virtual void DidMoveOrResize(ConstrainedWindow* window) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindow
 //
 //  This interface represents a window that is constrained to a TabContents'
@@ -87,21 +40,6 @@ class ConstrainedWindow {
       views::View* contents_view,
       views::WindowDelegate* window_delegate);
 
-  // Create a Constrained Window that contains a TabContents subclass, e.g. for
-  // a web popup. |initial_bounds| specifies the desired position of the
-  // |constrained_contents|, not the bounds of the window itself.
-  // |user_gesture| specifies whether or not this window was opened as a result
-  // of a user input event, or is an unsolicited popup.
-  static ConstrainedWindow* CreateConstrainedPopup(
-      TabContents* owner,
-      const gfx::Rect& initial_bounds,
-      TabContents* constrained_contents);
-
-  // Activates the Constrained Window, which has the effect of detaching it if
-  // it contains a WebContents, otherwise just brings it to the front of the
-  // z-order.
-  virtual void ActivateConstrainedWindow() = 0;
-
   // Closes the Constrained Window.
   virtual void CloseConstrainedWindow() = 0;
 
@@ -110,11 +48,6 @@ class ConstrainedWindow {
   virtual void RepositionConstrainedWindowTo(
       const gfx::Point& anchor_point) = 0;
 
-  // Returns true if the Constrained Window is being "suppressed" (i.e.
-  // positioned to the bottom right of the constraining TabContents) because it
-  // was opened without a user gesture.
-  virtual bool IsSuppressedConstrainedWindow() const = 0;
-
   // Tells the Constrained Window that the constraining TabContents was hidden,
   // e.g. via a tab switch.
   virtual void WasHidden() = 0;
@@ -126,9 +59,6 @@ class ConstrainedWindow {
   // Returns the title of the Constrained Window.
   virtual std::wstring GetWindowTitle() const = 0;
 
-  // Updates the Window's title and repaints the titlebar
-  virtual void UpdateWindowTitle() = 0;
-
   // Returns the current display rectangle (relative to its
   // parent). This method is only called from the unit tests to check
   // the location/size of a constrained window.
@@ -136,4 +66,3 @@ class ConstrainedWindow {
 };
 
 #endif  // #ifndef CHROME_BROWSER_CONSTRAINED_WINDOW_H__
-