Merge 21961 - The focus would be messedup when reloading a crashed tab, also ...

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc	(revision 22808)
+++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
@@ -1771,7 +1771,13 @@
   }
 
   NotifyConnected();
+  bool was_crashed = is_crashed();
   SetIsCrashed(false);
+
+  // Restore the focus to the tab (otherwise the focus will be on the top
+  // window).
+  if (was_crashed && !FocusLocationBarByDefault())
+    Focus();
 }
 
 void TabContents::RenderViewGone(RenderViewHost* rvh) {
Property changes on: chrome\browser\tab_contents\tab_contents.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/tab_contents/tab_contents.cc:r21961