Replace TabContentsViewGtk with TabContentsViewViews as part of the ongoing

chrome/browser/gtk/constrained_window_gtk.h

Index: chrome/browser/gtk/constrained_window_gtk.h
diff --git a/chrome/browser/gtk/constrained_window_gtk.h b/chrome/browser/gtk/constrained_window_gtk.h
index 16b4b332607f058b2ffc92f8e27c52dbc1ccee05..f3ffaeb495fdf0dcfae7296af8b342fd5f80f64e 100644
--- a/chrome/browser/gtk/constrained_window_gtk.h
+++ b/chrome/browser/gtk/constrained_window_gtk.h
@@ -15,8 +15,14 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 
 class TabContents;
-class TabContentsViewGtk;
 typedef struct _GdkColor GdkColor;
+#if defined(TOUCH_UI)
+class TabContentsViewViews;
+typedef TabContentsViewViews TabContentsViewType;

[brettw, 2010/11/12 21:55:51]

Can you put this typedef inside the class so it's scoped. Otherwise, you have
this weird typedef in the global scope. Normally we would put this at the top of
the public section.

[oshima, 2010/11/13 01:36:08]

agreed

+#else
+class TabContentsViewGtk;
+typedef TabContentsViewGtk TabContentsViewType;
+#endif
 
 class ConstrainedWindowGtkDelegate {
  public:
@@ -51,7 +57,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
   GtkWidget* widget() { return border_.get(); }
 
   // Returns the View that we collaborate with to position ourselves.
-  TabContentsViewGtk* ContainingView();
+  TabContentsViewType* ContainingView();
 
  private:
   friend class ConstrainedWindow;
@@ -66,7 +72,7 @@ class ConstrainedWindowGtk : public ConstrainedWindow {
   // The TabContents that owns and constrains this ConstrainedWindow.
   TabContents* owner_;
 
-  // The top level widget container that exports to our TabContentsViewGtk.
+  // The top level widget container that exports to our TabContentsView.
   OwnedWidgetGtk border_;
 
   // Delegate that provides the contents of this constrained window.