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

chrome/browser/tab_contents/navigation_entry.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/tab_contents/navigation_entry.h"
 
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
@@ skipping 25 matching lines @@
 }
 
 
 NavigationEntry::NavigationEntry()
     : unique_id_(GetUniqueID()),
       site_instance_(NULL),
       page_type_(NORMAL_PAGE),
       page_id_(-1),
       transition_type_(PageTransition::LINK),
       has_post_data_(false),
-      restored_(false) {
+      restore_type_(RESTORE_NONE) {
 }
 
 NavigationEntry::NavigationEntry(SiteInstance* instance,
                                  int page_id,
                                  const GURL& url,
                                  const GURL& referrer,
                                  const string16& title,
                                  PageTransition::Type transition_type)
     : unique_id_(GetUniqueID()),
       site_instance_(instance),
       page_type_(NORMAL_PAGE),
       url_(url),
       referrer_(referrer),
       title_(title),
       page_id_(page_id),
       transition_type_(transition_type),
       has_post_data_(false),
-      restored_(false) {
+      restore_type_(RESTORE_NONE) {
 }
 
 NavigationEntry::~NavigationEntry() {
 }
 
 void NavigationEntry::set_site_instance(SiteInstance* site_instance) {
   site_instance_ = site_instance;
 }
 
 const string16& NavigationEntry::GetTitleForDisplay(
@@ skipping 19 matching lines @@
         virtual_url_, languages));
   } else if (!url_.is_empty()) {
     cached_display_title_ = WideToUTF16Hack(net::FormatUrl(url_, languages));
   }
   return cached_display_title_;
 }
 
 bool NavigationEntry::IsViewSourceMode() const {
   return virtual_url_.SchemeIs(chrome::kViewSourceScheme);
 }