Reverting 10400.

Reverting broke the linux build
Review URL: http://codereview.chromium.org/27178

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10402 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 9 deletions

diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index bff9a74..ced5e90 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -359,9 +359,6 @@ class SessionRestoreImpl : public NotificationObserver {
         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) {
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index bfd4310..13f8f34 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -446,12 +446,6 @@ class TabContents : public PageNavigator,
   // Called when a ConstrainedWindow we own is moved or resized.
   void DidMoveOrResize(ConstrainedWindow* window);
 
-  // Sets focus to the tab contents window, but doesn't actually set focus to
-  // a particular element in it (see also SetInitialFocus(bool) which does
-  // that in different circumstances).
-  // FIXME(brettw) having two SetInitialFocus that do different things is silly.
-  virtual void SetInitialFocus();
-
  protected:
   // NotificationObserver implementation:
   virtual void Observe(NotificationType type,
@@ -476,6 +470,12 @@ class TabContents : public PageNavigator,
   // Protected so that others don't try to delete this directly.
   virtual ~TabContents();
 
+  // Sets focus to the tab contents window, but doesn't actuall set focus to
+  // a particular element in it (see also SetInitialFocus(bool) which does
+  // that in different circumstances).
+  // FIXME(brettw) having two SetInitialFocus that do different things is silly.
+  virtual void SetInitialFocus();
+
   // Changes the IsLoading state and notifies delegate as needed
   // |details| is used to provide details on the load that just finished
   // (but can be null if not applicable). Can be overridden.