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

Unified Diff: chrome/browser/ui/views/constrained_window_views.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/views/constrained_window_views.h
diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h
index ef29024fdf97bce3006bc2342e706648b067e7ec..3ae92b43f0066ec0bc3de87c1706e680ff403984 100644
--- a/chrome/browser/ui/views/constrained_window_views.h
+++ b/chrome/browser/ui/views/constrained_window_views.h
@@ -13,6 +13,7 @@
#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 {
@@ -58,12 +59,12 @@ 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;
@@ -80,8 +81,7 @@ class ConstrainedWindowViews : public views::Widget,
virtual views::internal::NativeWidgetDelegate*
AsNativeWidgetDelegate() OVERRIDE;
- // The TabContents that owns and constrains this ConstrainedWindow.
- TabContents* owner_;
+ TabContentsWrapper* wrapper_;
NativeConstrainedWindow* native_constrained_window_;

Powered by Google App Engine
This is Rietveld 408576698