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

Unified Diff: chrome/browser/ui/gtk/constrained_window_gtk.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/gtk/constrained_window_gtk.h
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h
index 2b7b4c16add520558025a1681e44dc4051905965..7180112f28196849fc3f3a86d6b06f826bf629d4 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.h
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.h
@@ -14,7 +14,7 @@
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/gtk/owned_widget_gtk.h"
-class TabContents;
+class TabContentsWrapper;
typedef struct _GdkColor GdkColor;
#if defined(TOUCH_UI)
class TabContentsViewViews;
@@ -58,7 +58,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
typedef TabContentsViewGtk TabContentsViewType;
#endif
- ConstrainedWindowGtk(TabContents* owner,
+ ConstrainedWindowGtk(TabContentsWrapper* wrapper,
ConstrainedWindowGtkDelegate* delegate);
virtual ~ConstrainedWindowGtk();
@@ -68,7 +68,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
virtual void FocusConstrainedWindow();
// 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_; }
// Returns the toplevel widget that displays this "window".
GtkWidget* widget() { return border_.get(); }
@@ -86,7 +86,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
GtkWidget*);
// The TabContents that owns and constrains this ConstrainedWindow.
Avi (use Gerrit) 2011/09/29 18:30:36 comment?
- TabContents* owner_;
+ TabContentsWrapper* wrapper_;
// The top level widget container that exports to our TabContentsView.
ui::OwnedWidgetGtk border_;

Powered by Google App Engine
This is Rietveld 408576698