Reverting 30062.

Reverting 30062.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=30068

[Ben Goodger (Google), 2009-10-26 18:35:19]

LGTM

On Mon, Oct 26, 2009 at 11:33 AM, <glen@chromium.org> wrote:

> Reviewers: Ben Goodger,
>
> Description:
> Reverting 30062.
>
> Please review this at http://codereview.chromium.org/338022
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome/browser/automation/automation_provider.cc
>  M     chrome/browser/browser.h
>  M     chrome/browser/browser.cc
>
>
> Index: chrome/browser/automation/automation_provider.cc
> ===================================================================
> --- chrome/browser/automation/automation_provider.cc    (revision 30067)
> +++ chrome/browser/automation/automation_provider.cc    (working copy)
> @@ -1144,7 +1144,7 @@
>   Browser* browser = browser_tracker_->GetResource(handle);
>   if (browser) {
>     FindBarTesting* find_bar =
> -        browser->GetFindBarController()->find_bar()->GetFindBarTesting();
> +        browser->find_bar()->find_bar()->GetFindBarTesting();
>     find_bar->GetFindBarWindowInfo(NULL, visible);
>   }
>  }
> @@ -1156,7 +1156,7 @@
>   if (browser_tracker_->ContainsHandle(handle)) {
>      Browser* browser = browser_tracker_->GetResource(handle);
>      FindBarTesting* find_bar =
> -       browser->GetFindBarController()->find_bar()->GetFindBarTesting();
> +       browser->find_bar()->find_bar()->GetFindBarTesting();
>      find_bar->GetFindBarWindowInfo(&position, &visible);
>   }
>
> Index: chrome/browser/browser.cc
> ===================================================================
> --- chrome/browser/browser.cc   (revision 30067)
> +++ chrome/browser/browser.cc   (working copy)
> @@ -246,6 +246,10 @@
>     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());
>  }
>
>
> 
///////////////////////////////////////////////////////////////////////////////
> @@ -260,17 +264,6 @@
>   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:
>
> @@ -942,7 +935,7 @@
>  }
>
>  void Browser::ShowFindBar() {
> -  GetFindBarController()->Show();
> +  find_bar_controller_->Show();
>  }
>
>  bool Browser::SupportsWindowFeature(WindowFeature feature) const {
> @@ -1765,7 +1758,8 @@
>
>   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
> Index: chrome/browser/browser.h
> ===================================================================
> --- chrome/browser/browser.h    (revision 30067)
> +++ chrome/browser/browser.h    (working copy)
> @@ -134,7 +134,6 @@
>   const SessionID& session_id() const { return session_id_; }
>   CommandUpdater* command_updater() { return &command_updater_; }
>   FindBarController* find_bar() { return find_bar_controller_.get(); }
> -  FindBarController* GetFindBarController();
>   ExtensionShelfModel* extension_shelf_model() {
>     return extension_shelf_model_.get();
>   }
>
>
>