Fix focus bug on session restore (take 2)

chrome/browser/sessions/session_restore.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/sessions/session_restore.h"
 
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser.h"
@@ skipping 341 matching lines @@
       browser->SelectTabContentsAt(browser->tab_count() - 1, true);
       return;
     }
 
     DCHECK(browser);
     DCHECK(browser->tab_count());
     browser->SelectTabContentsAt(
         std::min(initial_tab_count + std::max(0, selected_session_index),
                  browser->tab_count() - 1), true);
     browser->window()->Show();
+    // Showing the browser focuses the location bar, let the tab decide where
+    // it wants the focus to be.
+    browser->GetSelectedTabContents()->SetInitialFocus();
   }
 
   void AppendURLsToBrowser(Browser* browser, const std::vector<GURL>& urls) {
     for (size_t i = 0; i < urls.size(); ++i) {
       browser->AddTabWithURL(urls[i], GURL(), PageTransition::START_PAGE,
                             (i == 0), NULL);
     }
   }
 
   // Invokes TabRestored on the SessionService for all tabs in browser after
@@ skipping 72 matching lines @@
   Restore(profile, browser, false, clobber_existing_window,
           always_create_tabbed_browser, urls_to_open);
 }
 
 // static
 void SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   Restore(profile, NULL, true, false, true, urls_to_open);
 }