Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/ui/gtk/constrained_window_gtk.cc

Index: chrome/browser/ui/gtk/constrained_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index 1fafc73a67422d6b4dcc304d8c6e1168e94313df..65004acee146566019c13e1699a2622e6e951a53 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -126,7 +126,7 @@ void ConstrainedWindowGtk::FocusConstrainedWindow() {
   // TODO(estade): this define should not need to be here because this class
   // should not be used on linux/views.
 #if defined(TOOLKIT_GTK)
-    static_cast<TabContentsViewGtk*>(wrapper_->view())->
+    static_cast<TabContentsViewGtk*>(wrapper_->tab_contents()->view())->
         SetFocusedWidget(focus_widget);
 #endif
   }
@@ -136,11 +136,11 @@ ConstrainedWindowGtk::TabContentsViewType*
     ConstrainedWindowGtk::ContainingView() {
 #if defined(TOOLKIT_VIEWS)
   return static_cast<NativeTabContentsViewGtk*>(
-      static_cast<TabContentsViewViews*>(wrapper_->view())->
+      static_cast<TabContentsViewViews*>(wrapper_->tab_contents()->view())->
           native_tab_contents_view());
 #else
   return static_cast<TabContentsViewType*>(
-      static_cast<TabContentsViewGtk*>(wrapper_->view())->
+      static_cast<TabContentsViewGtk*>(wrapper_->tab_contents()->view())->
           wrapper());
 #endif
 }