Changes session restore to use a normal load rather than preferring...

chrome/browser/tab_contents/navigation_controller.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <string>
@@ skipping 132 matching lines @@
     return profile_;
   }
 
   // Sets the profile for this controller.
   void set_profile(Profile* profile) {
     profile_ = profile;
   }
 
   // Initializes this NavigationController with the given saved navigations,
   // using selected_navigation as the currently loaded entry. Before this call
-  // the controller should be unused (there should be no current entry). This is
-  // used for session restore.
+  // the controller should be unused (there should be no current entry). If
+  // from_last_session is true, navigations are from the previous session,
+  // otherwise they are from the current session (undo tab close).
+  // This is used for session restore.
   void RestoreFromState(const std::vector<TabNavigation>& navigations,
-                        int selected_navigation);
+                        int selected_navigation, bool from_last_session);
 
   // Active entry --------------------------------------------------------------
 
   // Returns the active entry, which is the transient entry if any, the pending
   // entry if a navigation is in progress or the last committed entry otherwise.
   // NOTE: This can be NULL!!
   //
   // If you are trying to get the current state of the NavigationController,
   // this is the method you will typically want to call.
   NavigationEntry* GetActiveEntry() const;
@@ skipping 267 matching lines @@
 
   // Sets the max restored page ID this NavigationController has seen, if it
   // was restored from a previous session.
   void set_max_restored_page_id(int max_id) { max_restored_page_id_ = max_id; }
 
   NavigationEntry* CreateNavigationEntry(const GURL& url, const GURL& referrer,
                                          PageTransition::Type transition);
 
   // Invoked after session/tab restore or cloning a tab. Resets the transition
   // type of the entries, updates the max page id and creates the active
-  // contents.
-  void FinishRestore(int selected_index);
+  // contents. See RestoreFromState for a description of from_last_session.
+  void FinishRestore(int selected_index, bool from_last_session);
 
   // Inserts a new entry or replaces the current entry with a new one, removing
   // all entries after it. The new entry will become the active one.
   void InsertOrReplaceEntry(NavigationEntry* entry, bool replace);
 
   // Discards the pending and transient entries.
   void DiscardNonCommittedEntriesInternal();
 
   // Discards the transient entry.
   void DiscardTransientEntry();
@@ skipping 70 matching lines @@
   // when testing.
   static bool check_for_repost_;
 
   // The maximum number of entries that a navigation controller can store.
   static size_t max_entry_count_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_