OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/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_url_handler.h" | 13 #include "chrome/browser/browser_url_handler.h" |
14 #include "chrome/browser/prefs/pref_service.h" | 14 #include "chrome/browser/prefs/pref_service.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/sessions/session_types.h" | 16 #include "chrome/browser/sessions/session_types.h" |
17 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
18 #include "chrome/common/navigation_types.h" | |
19 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
20 #include "chrome/common/render_messages_params.h" | 19 #include "chrome/common/render_messages_params.h" |
21 #include "chrome/common/url_constants.h" | 20 #include "chrome/common/url_constants.h" |
22 #include "content/browser/in_process_webkit/session_storage_namespace.h" | 21 #include "content/browser/in_process_webkit/session_storage_namespace.h" |
23 #include "content/browser/site_instance.h" | 22 #include "content/browser/site_instance.h" |
24 #include "content/browser/tab_contents/interstitial_page.h" | 23 #include "content/browser/tab_contents/interstitial_page.h" |
25 #include "content/browser/tab_contents/navigation_entry.h" | 24 #include "content/browser/tab_contents/navigation_entry.h" |
26 #include "content/browser/tab_contents/tab_contents.h" | 25 #include "content/browser/tab_contents/tab_contents.h" |
27 #include "content/browser/tab_contents/tab_contents_delegate.h" | 26 #include "content/browser/tab_contents/tab_contents_delegate.h" |
| 27 #include "content/common/navigation_types.h" |
28 #include "content/common/notification_service.h" | 28 #include "content/common/notification_service.h" |
29 #include "grit/app_resources.h" | 29 #include "grit/app_resources.h" |
30 #include "net/base/escape.h" | 30 #include "net/base/escape.h" |
31 #include "net/base/mime_util.h" | 31 #include "net/base/mime_util.h" |
32 #include "net/base/net_util.h" | 32 #include "net/base/net_util.h" |
33 #include "webkit/glue/webkit_glue.h" | 33 #include "webkit/glue/webkit_glue.h" |
34 | 34 |
35 namespace { | 35 namespace { |
36 | 36 |
37 const int kInvalidateAllButShelves = | 37 const int kInvalidateAllButShelves = |
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1184 size_t insert_index = 0; | 1184 size_t insert_index = 0; |
1185 for (int i = 0; i < max_index; i++) { | 1185 for (int i = 0; i < max_index; i++) { |
1186 // When cloning a tab, copy all entries except interstitial pages | 1186 // When cloning a tab, copy all entries except interstitial pages |
1187 if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) { | 1187 if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) { |
1188 entries_.insert(entries_.begin() + insert_index++, | 1188 entries_.insert(entries_.begin() + insert_index++, |
1189 linked_ptr<NavigationEntry>( | 1189 linked_ptr<NavigationEntry>( |
1190 new NavigationEntry(*source.entries_[i]))); | 1190 new NavigationEntry(*source.entries_[i]))); |
1191 } | 1191 } |
1192 } | 1192 } |
1193 } | 1193 } |
OLD | NEW |