content: Move constrained window code from TabContents to TabContentsWrapper

chrome/browser/ui/views/constrained_window_views.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_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "views/widget/widget.h"
 
 class TabContents;

[Avi (use Gerrit), 2011/09/29 18:30:36]

forward decl still needed?

+class TabContentsWrapper;
 
 namespace views {
 namespace internal {
 class NativeWidgetDelegate;
 }
 class NativeWidget;
 class NonClientFrameView;
 class WidgetDelegate;
 }
 
@@ skipping 25 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowViews
 //
 //  A ConstrainedWindow implementation that implements a Constrained Window as
 //  a child HWND with a custom window frame.
 //
 class ConstrainedWindowViews : public views::Widget,
                                public ConstrainedWindow,
                                public NativeConstrainedWindowDelegate {
  public:
-  ConstrainedWindowViews(TabContents* owner,
+  ConstrainedWindowViews(TabContentsWrapper* wrapper,
                          views::WidgetDelegate* widget_delegate);
   virtual ~ConstrainedWindowViews();
 
   // Returns the TabContents that constrains this Constrained Window.

[Avi (use Gerrit), 2011/09/29 18:30:36]

comment?

-  TabContents* owner() const { return owner_; }
+  TabContentsWrapper* owner() const { return wrapper_; }
 
   // Overridden from ConstrainedWindow:
   virtual void ShowConstrainedWindow() OVERRIDE;
   virtual void CloseConstrainedWindow() OVERRIDE;
   virtual void FocusConstrainedWindow() OVERRIDE;
 
  private:
   // Overridden from views::Widget:
   virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
 
   // Overridden from NativeConstrainedWindowDelegate:
   virtual void OnNativeConstrainedWindowDestroyed() OVERRIDE;
   virtual void OnNativeConstrainedWindowMouseActivate() OVERRIDE;
   virtual views::internal::NativeWidgetDelegate*
       AsNativeWidgetDelegate() OVERRIDE;
 
-  // The TabContents that owns and constrains this ConstrainedWindow.
-  TabContents* owner_;
+  TabContentsWrapper* wrapper_;
 
   NativeConstrainedWindow* native_constrained_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_