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

chrome/browser/ui/find_bar/find_bar_controller.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/find_bar/find_bar_controller.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/gfx/rect.h"
 
 // The minimum space between the FindInPage window and the search result.
 static const int kMinFindWndDistanceFromSelection = 5;
 
 FindBarController::FindBarController(FindBar* find_bar)
     : find_bar_(find_bar),
       tab_contents_(NULL),
@@ skipping 50 matching lines @@
   // Hide any visible find window from the previous tab if NULL |tab_contents|
   // is passed in or if the find UI is not active in the new tab.
   if (find_bar_->IsFindBarVisible() &&
       (!tab_contents_ || !tab_contents_->find_tab_helper()->find_ui_active())) {
     find_bar_->Hide(false);
   }
 
   if (!tab_contents_)
     return;
 
-  registrar_.Add(this, chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
                  content::Source<TabContents>(tab_contents_->tab_contents()));
   registrar_.Add(
-      this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::Source<NavigationController>(&tab_contents_->controller()));
+      this,
+      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+      content::Source<NavigationController>(
+          &tab_contents_->tab_contents()->controller()));
 
   MaybeSetPrepopulateText();
 
   if (tab_contents_->find_tab_helper()->find_ui_active()) {
     // A tab with a visible find bar just got selected and we need to show the
     // find bar but without animation since it was already animated into its
     // visible state. We also want to reset the window location so that
     // we don't surprise the user by popping up to the left for no apparent
     // reason.
     find_bar_->Show(false);
@@ skipping 19 matching lines @@
           find_tab_helper->find_result().number_of_matches() == 0) {
         const string16& last_search = find_tab_helper->previous_find_text();
         const string16& current_search = find_tab_helper->find_text();
         if (last_search.find(current_search) != 0)
           find_bar_->AudibleAlert();
       }
     }
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         content::Source<NavigationController>(source).ptr();
-    if (source_controller == &tab_contents_->controller()) {
+    if (source_controller == &tab_contents_->tab_contents()->controller()) {
       content::LoadCommittedDetails* commit_details =
           content::Details<content::LoadCommittedDetails>(details).ptr();
       content::PageTransition transition_type =
           commit_details->entry->transition_type();
       // We hide the FindInPage window when the user navigates away, except on
       // reload.
       if (find_bar_->IsFindBarVisible()) {
         if (content::PageTransitionStripQualifier(transition_type) !=
             content::PAGE_TRANSITION_RELOAD) {
           EndFindSession(kKeepSelection);
@@ skipping 88 matching lines @@
   // shown it is showing the right state for this tab. We update the find text
   // _first_ since the FindBarView checks its emptiness to see if it should
   // clear the result count display when there's nothing in the box.
   find_bar_->SetFindText(find_string);
 #else
   // Having a per-tab find_string is not compatible with OS X's find pasteboard,
   // so we always have the same find text in all find bars. This is done through
   // the find pasteboard mechanism, so don't set the text here.
 #endif
 }