Fix focus bug when reloading crashed tab

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/idle_timer.h"
@@ skipping 718 matching lines @@
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab) {
     if (current_tab->showing_interstitial_page()) {
       NavigationEntry* entry = current_tab->controller().GetActiveEntry();
       DCHECK(entry);  // Should exist if interstitial is showing.
       OpenURL(entry->url(), GURL(), CURRENT_TAB, PageTransition::RELOAD);
       return;
     }
 
     // As this is caused by a user action, give the focus to the page.
-    current_tab->Focus();
+    if (!current_tab->FocusLocationBarByDefault())
+      current_tab->Focus();
     current_tab->controller().Reload(true);
   }
 }
 
 void Browser::Home(WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(L"Home", profile_);
   OpenURL(GetHomePage(), GURL(), disposition, PageTransition::AUTO_BOOKMARK);
 }
 
 void Browser::OpenCurrentURL() {
@@ skipping 2026 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }