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

chrome/browser/ui/gtk/constrained_window_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 108 matching lines @@
   ConstrainedWindowTabHelper* helper =
       wrapper_->constrained_window_tab_helper();
   if ((!helper->delegate() ||
        helper->delegate()->ShouldFocusConstrainedWindow()) &&
       gtk_util::IsWidgetAncestryVisible(focus_widget)) {
     gtk_widget_grab_focus(focus_widget);
   } else {
   // 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
   }
 }
 
 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
 }
 
 gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
                                           GdkEventKey* key) {
   if (key->keyval == GDK_Escape) {
     // Let the stack unwind so the event handler can release its ref
     // on widget().
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ConstrainedWindowGtk::CloseConstrainedWindow,
                    weak_factory_.GetWeakPtr()));
     return TRUE;
   }
 
   return FALSE;
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
     return;
 
   FocusConstrainedWindow();
 }