| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/tab_contents/navigation_controller.h" | 5 #include "chrome/browser/tab_contents/navigation_controller.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_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/browser/browser_about_handler.h" | 12 #include "chrome/browser/browser_about_handler.h" |
| 13 #include "chrome/browser/browser_process.h" | |
| 14 #include "chrome/browser/browser_url_handler.h" | 13 #include "chrome/browser/browser_url_handler.h" |
| 15 #include "chrome/browser/in_process_webkit/session_storage_namespace.h" | 14 #include "chrome/browser/in_process_webkit/session_storage_namespace.h" |
| 16 #include "chrome/browser/prefs/pref_service.h" | 15 #include "chrome/browser/prefs/pref_service.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/renderer_host/site_instance.h" | 17 #include "chrome/browser/renderer_host/site_instance.h" |
| 19 #include "chrome/browser/sessions/session_types.h" | 18 #include "chrome/browser/sessions/session_types.h" |
| 20 #include "chrome/browser/tab_contents/interstitial_page.h" | 19 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 21 #include "chrome/browser/tab_contents/navigation_entry.h" | 20 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 22 #include "chrome/browser/tab_contents/tab_contents.h" | 21 #include "chrome/browser/tab_contents/tab_contents.h" |
| 23 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 22 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| (...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1200 size_t insert_index = 0; | 1199 size_t insert_index = 0; |
| 1201 for (int i = 0; i < max_index; i++) { | 1200 for (int i = 0; i < max_index; i++) { |
| 1202 // When cloning a tab, copy all entries except interstitial pages | 1201 // When cloning a tab, copy all entries except interstitial pages |
| 1203 if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) { | 1202 if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) { |
| 1204 entries_.insert(entries_.begin() + insert_index++, | 1203 entries_.insert(entries_.begin() + insert_index++, |
| 1205 linked_ptr<NavigationEntry>( | 1204 linked_ptr<NavigationEntry>( |
| 1206 new NavigationEntry(*source.entries_[i]))); | 1205 new NavigationEntry(*source.entries_[i]))); |
| 1207 } | 1206 } |
| 1208 } | 1207 } |
| 1209 } | 1208 } |
| OLD | NEW |