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

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: Fix mac compile (add forward declaration to file that didn't have it) 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..5dbaa61fcd380583c472ac72a88b49e5329e9279 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();
@@ -67,8 +67,8 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
virtual void CloseConstrainedWindow();
virtual void FocusConstrainedWindow();
- // Returns the TabContents that constrains this Constrained Window.
- TabContents* owner() const { return owner_; }
+ // Returns the TabContentsWrapper that constrains this Constrained Window.
+ TabContentsWrapper* owner() const { return wrapper_; }
// Returns the toplevel widget that displays this "window".
GtkWidget* widget() { return border_.get(); }
@@ -85,8 +85,8 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
CHROMEGTK_CALLBACK_1(ConstrainedWindowGtk, void, OnHierarchyChanged,
GtkWidget*);
- // The TabContents that owns and constrains this ConstrainedWindow.
- TabContents* owner_;
+ // The TabContentsWrapper that owns and constrains this ConstrainedWindow.
+ TabContentsWrapper* wrapper_;
// The top level widget container that exports to our TabContentsView.
ui::OwnedWidgetGtk border_;
« no previous file with comments | « chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc ('k') | chrome/browser/ui/gtk/constrained_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698