| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "content/browser/tab_contents/navigation_controller_impl.h" | 5 #include "content/browser/tab_contents/navigation_controller_impl.h" | 
| 6 | 6 | 
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" | 
| 8 #include "base/logging.h" | 8 #include "base/logging.h" | 
| 9 #include "base/string_number_conversions.h"  // Temporary | 9 #include "base/string_number_conversions.h"  // Temporary | 
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" | 
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 176       transient_entry_index_(-1), | 176       transient_entry_index_(-1), | 
| 177       tab_contents_(contents), | 177       tab_contents_(contents), | 
| 178       max_restored_page_id_(-1), | 178       max_restored_page_id_(-1), | 
| 179       ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this)), | 179       ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this)), | 
| 180       needs_reload_(false), | 180       needs_reload_(false), | 
| 181       session_storage_namespace_(session_storage_namespace), | 181       session_storage_namespace_(session_storage_namespace), | 
| 182       pending_reload_(NO_RELOAD) { | 182       pending_reload_(NO_RELOAD) { | 
| 183   DCHECK(browser_context_); | 183   DCHECK(browser_context_); | 
| 184   if (!session_storage_namespace_) { | 184   if (!session_storage_namespace_) { | 
| 185     session_storage_namespace_ = new SessionStorageNamespace( | 185     session_storage_namespace_ = new SessionStorageNamespace( | 
| 186         browser_context_->GetWebKitContext()); | 186         BrowserContext::GetWebKitContext(browser_context_)); | 
| 187   } | 187   } | 
| 188 } | 188 } | 
| 189 | 189 | 
| 190 NavigationControllerImpl::~NavigationControllerImpl() { | 190 NavigationControllerImpl::~NavigationControllerImpl() { | 
| 191   DiscardNonCommittedEntriesInternal(); | 191   DiscardNonCommittedEntriesInternal(); | 
| 192 | 192 | 
| 193   content::NotificationService::current()->Notify( | 193   content::NotificationService::current()->Notify( | 
| 194       content::NOTIFICATION_TAB_CLOSED, | 194       content::NOTIFICATION_TAB_CLOSED, | 
| 195       content::Source<NavigationController>(this), | 195       content::Source<NavigationController>(this), | 
| 196       content::NotificationService::NoDetails()); | 196       content::NotificationService::NoDetails()); | 
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1410   for (int i = 0; i < max_index; i++) { | 1410   for (int i = 0; i < max_index; i++) { | 
| 1411     // When cloning a tab, copy all entries except interstitial pages | 1411     // When cloning a tab, copy all entries except interstitial pages | 
| 1412     if (source.entries_[i].get()->GetPageType() != | 1412     if (source.entries_[i].get()->GetPageType() != | 
| 1413         content::PAGE_TYPE_INTERSTITIAL) { | 1413         content::PAGE_TYPE_INTERSTITIAL) { | 
| 1414       entries_.insert(entries_.begin() + insert_index++, | 1414       entries_.insert(entries_.begin() + insert_index++, | 
| 1415                       linked_ptr<NavigationEntryImpl>( | 1415                       linked_ptr<NavigationEntryImpl>( | 
| 1416                           new NavigationEntryImpl(*source.entries_[i]))); | 1416                           new NavigationEntryImpl(*source.entries_[i]))); | 
| 1417     } | 1417     } | 
| 1418   } | 1418   } | 
| 1419 } | 1419 } | 
| OLD | NEW | 
|---|