Fix focus bug on session restore (take 2)

chrome/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <string>
@@ skipping 428 matching lines @@
   // currently called by NavigationController::DiscardPendingEntry. We may
   // want to generalize this if we need to migrate some other state.
   static void MigrateShelfView(TabContents* from, TabContents* to);
 
   // Called when a ConstrainedWindow we own is about to be closed.
   void WillClose(ConstrainedWindow* window);
 
   // 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,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   friend class NavigationController;
   // Used to access the child_windows_ (ConstrainedWindowList) for testing
   // automation purposes.
   friend class AutomationProvider;
 
   explicit TabContents(TabContentsType type);
 
   // Some tab contents types need to override the type.
   void set_type(TabContentsType type) { type_ = type; }
 
   // NOTE: the TabContents destructor can run after the NavigationController
   // has gone away, so any complicated unregistering that expects the profile
   // or other shared objects to still be around does not belong in a
   // destructor.
   // For those purposes, instead see Destroy().
   // 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.
   virtual void SetIsLoading(bool is_loading, LoadNotificationDetails* details);
 
   // Called by a derived class when the TabContents is resized, causing
   // suppressed constrained web popups to be repositioned to the new bounds
   // if necessary.
   void RepositionSupressedPopupsToFit(const gfx::Size& new_size);
 
@@ skipping 69 matching lines @@
   // Delegates for InfoBars associated with this TabContents.
   std::vector<InfoBarDelegate*> infobar_delegates_;
 
   // See getter above.
   bool is_being_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_