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

chrome/browser/views/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 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/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
@@ skipping 244 matching lines @@
 
 void TabContentsViewWin::Focus() {
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
 
   if (tab_contents()->interstitial_page()) {
     tab_contents()->interstitial_page()->Focus();
     return;
   }
 
-  if (sad_tab_.get()) {
+  if (tab_contents()->is_crashed() && sad_tab_.get()) {
     sad_tab_->RequestFocus();
     return;
   }
 
   RenderWidgetHostView* rwhv = tab_contents()->render_widget_host_view();
   if (rwhv) {
     ::SetFocus(rwhv->GetNativeView());
     return;
   }
 
@@ skipping 395 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }