Merge 32284 - Fix find bar scrolling with the page after switching back to ta...

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
===================================================================
--- chrome/browser/views/frame/browser_view.cc	(revision 32724)
+++ chrome/browser/views/frame/browser_view.cc	(working copy)
@@ -1287,19 +1287,12 @@
   // Update various elements that are interested in knowing the current
   // TabContents.
 
-  // When we toggle the NTP floating bookmarks bar,
+  // When we toggle the NTP floating bookmarks bar and/or the info bar,
   // we don't want any TabContents to be attached, so that we
   // avoid an unnecessary resize and re-layout of a TabContents.
   contents_container_->ChangeTabContents(NULL);
-
   infobar_container_->ChangeTabContents(new_contents);
-
-  // Update all the UI bits.
-  UpdateTitleBar();
-  toolbar_->SetProfile(new_contents->profile());
-  UpdateToolbar(new_contents, true);
   UpdateUIForContents(new_contents);
-
   contents_container_->ChangeTabContents(new_contents);
 
   UpdateDevToolsForContents(new_contents);
@@ -1314,6 +1307,12 @@
     // handlers when we are eventually shown.
     new_contents->view()->RestoreFocus();
   }
+
+  // Update all the UI bits.
+  UpdateTitleBar();
+  toolbar_->SetProfile(new_contents->profile());
+  UpdateToolbar(new_contents, true);
+  UpdateUIForContents(new_contents);
 }
 
 void BrowserView::TabStripEmpty() {
Property changes on: chrome\browser\views\frame\browser_view.cc
___________________________________________________________________
Deleted: svn:mergeinfo