Reverting 30062.

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/keyboard_codes.h"
@@ skipping 228 matching lines @@
     return;
   if (local_state->IsPrefRegistered(prefs::kShouldShowFirstRunBubble) &&
       local_state->GetBoolean(prefs::kShouldShowFirstRunBubble)) {
     bool show_OEM_bubble = (local_state->
         IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble) &&
         local_state->GetBoolean(prefs::kShouldUseOEMFirstRunBubble));
     // Reset the preference so we don't show the bubble for subsequent windows.
     local_state->ClearPref(prefs::kShouldShowFirstRunBubble);
     window_->GetLocationBar()->ShowFirstRunBubble(show_OEM_bubble);
   }
+
+  FindBar* find_bar = BrowserWindow::CreateFindBar(this);
+  find_bar_controller_.reset(new FindBarController(find_bar));
+  find_bar->SetFindBarController(find_bar_controller_.get());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Getters & Setters
 
 const std::vector<std::wstring>& Browser::user_data_dir_profiles() const {
   return g_browser_process->user_data_dir_profiles();
 }
 
 void Browser::set_user_data_dir_profiles(
     const std::vector<std::wstring>& profiles) {
   g_browser_process->user_data_dir_profiles() = profiles;
 }
 
-FindBarController* Browser::GetFindBarController() {
-  if (!find_bar_controller_.get()) {
-    FindBar* find_bar = BrowserWindow::CreateFindBar(this);
-    find_bar_controller_.reset(new FindBarController(find_bar));
-    find_bar->SetFindBarController(find_bar_controller_.get());
-    find_bar_controller_->ChangeTabContents(GetSelectedTabContents());
-    find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
-  }
-  return find_bar_controller_.get();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Creation Helpers:
 
 // static
 void Browser::OpenEmptyWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->AddBlankTab(true);
   browser->window()->Show();
 }
 
@@ skipping 651 matching lines @@
 
   TabContents* current_tab = GetSelectedTabContents();
   NavigationEntry* entry = current_tab->controller().GetLastCommittedEntry();
   if (entry) {
     GURL url("view-source:" + entry->url().spec());
     OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   }
 }
 
 void Browser::ShowFindBar() {
-  GetFindBarController()->Show();
+  find_bar_controller_->Show();
 }
 
 bool Browser::SupportsWindowFeature(WindowFeature feature) const {
   unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF;
   if (type() == TYPE_NORMAL) {
     features |= FEATURE_BOOKMARKBAR;
     features |= FEATURE_EXTENSIONSHELF;
   }
   if (!window_ || !window_->IsFullscreen()) {
     if (type() == TYPE_NORMAL)
@@ skipping 802 matching lines @@
   StatusBubble* status_bubble = GetStatusBubble();
   if (status_bubble) {
     status_bubble->Hide();
 
     // Show the loading state (if any).
     status_bubble->SetStatus(GetSelectedTabContents()->GetStatusText());
   }
 
   if (find_bar_controller_.get()) {
     find_bar_controller_->ChangeTabContents(new_contents);
-    find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
+    find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(),
+                                                                true);
   }
 
   // Update sessions. Don't force creation of sessions. If sessions doesn't
   // exist, the change will be picked up by sessions when created.
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service && !tabstrip_model_.closing_all()) {
       session_service->SetSelectedTabInWindow(
           session_id(), tabstrip_model_.selected_index());
     }
@@ skipping 1179 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }