diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 20:35:37 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 20:35:37 +0000 |
| commit | 24db8a07affa9456337a9b7eb1c22dffff2c0458 (patch) | |
| tree | 41f2a49c5909bf54fb706628956310993c912912 /chrome/browser/views/frame | |
| parent | 9eabdd09a7af3be5341e4ff2627fe4023aaa0ab6 (diff) | |
| download | chromium_src-24db8a07affa9456337a9b7eb1c22dffff2c0458.zip chromium_src-24db8a07affa9456337a9b7eb1c22dffff2c0458.tar.gz chromium_src-24db8a07affa9456337a9b7eb1c22dffff2c0458.tar.bz2 | |
Fix and re-enable a test I broke with the find bar changes I made last night.
Remove Browser::find_bar(), make everyone use either Browser::GetFindBarController() which creates the FindBarController on demand, or a new method HasFindBarController(), which can be used to check for its existence (so as to avoid creating it unnecessarily).
http://crbug.com/26231
TEST=interactive ui tests, standard find tests
Review URL: http://codereview.chromium.org/348015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index cb28200..8034fb6 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -1633,9 +1633,10 @@ void BrowserView::Layout() { // back into us to find the bounding box the find bar must be laid out within, // and that code depends on the TabContentsContainer's bounds being up to // date. - FindBarController* find_controller = browser_->find_bar(); - if (find_controller) - find_controller->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true); + if (browser_->HasFindBarController()) { + browser_->GetFindBarController()->find_bar()->MoveWindowIfNecessary( + gfx::Rect(), true); + } // Align status bubble with the bottom of the contents_container_. LayoutStatusBubble(top + contents_container_->bounds().height()); SchedulePaint(); |