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

chrome/browser/tab_contents/navigation_entry.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_NAVIGATION_ENTRY_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 342 matching lines @@
   //
   // The actual post data is stored in the content_state and is extracted by
   // WebKit to actually make the request.
   void set_has_post_data(bool has_post_data) {
     has_post_data_ = has_post_data;
   }
   bool has_post_data() const {
     return has_post_data_;
   }
 
-  // Was this entry created from session/tab restore? If so this is true and
-  // gets set to false once we navigate to it.
-  // (See NavigationController::DidNavigateToEntry).
-  void set_restored(bool restored) {
-    restored_ = restored;
+  // Enumerations of the possible restore types.
+  enum RestoreType {
+    // The entry has been restored is from the last session.
+    RESTORE_LAST_SESSION,
+
+    // The entry has been restored from the current session. This is used when
+    // the user issues 'reopen closed tab'.
+    RESTORE_CURRENT_SESSION,
+
+    // The entry was not restored.
+    RESTORE_NONE
+  };
+
+  // The RestoreType for this entry. This is set if the entry was retored. This
+  // is set to RESTORE_NONE once the entry is loaded.
+  void set_restore_type(RestoreType type) {
+    restore_type_ = type;
   }
-  bool restored() const {
-    return restored_;
+  RestoreType restore_type() const {
+    return restore_type_;
   }
 
  private:
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Session/Tab restore save portions of this class so that it can be recreated
   // later. If you add a new field that needs to be persisted you'll have to
   // update SessionService/TabRestoreService appropriately.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   int unique_id_;
   scoped_refptr<SiteInstance> site_instance_;
   PageType page_type_;
   GURL url_;
   GURL referrer_;
   GURL virtual_url_;
   string16 title_;
   FaviconStatus favicon_;
   std::string content_state_;
   int32 page_id_;
   SSLStatus ssl_;
   PageTransition::Type transition_type_;
   GURL user_typed_url_;
   bool has_post_data_;
-  bool restored_;
+  RestoreType restore_type_;
 
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL evey time the title is
   // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
   string16 cached_display_title_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_