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

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 5bf1daaff493e995bf6de2bc13e384c17fbe1f0f..9914f2ed3d8fb720ea9859036e6dcc0055a07d8d 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1254,7 +1254,7 @@ void BrowserWindowGtk::ActiveTabChanged(TabContentsWrapper* old_contents,
                                         int index,
                                         bool user_gesture) {
   if (old_contents && !old_contents->tab_contents()->is_being_destroyed())
-    old_contents->view()->StoreFocus();
+    old_contents->tab_contents()->view()->StoreFocus();
 
   // Update various elements that are interested in knowing the current
   // TabContents.
@@ -1266,7 +1266,7 @@ void BrowserWindowGtk::ActiveTabChanged(TabContentsWrapper* old_contents,
   // TODO(estade): after we manage browser activation, add a check to make sure
   // we are the active browser before calling RestoreFocus().
   if (!browser_->tabstrip_model()->closing_all()) {
-    new_contents->view()->RestoreFocus();
+    new_contents->tab_contents()->view()->RestoreFocus();
     if (new_contents->find_tab_helper()->find_ui_active())
       browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
   }