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" |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 bool reverse_on_redirect = false; | 235 bool reverse_on_redirect = false; |
236 BrowserURLHandler::RewriteURLIfNecessary( | 236 BrowserURLHandler::RewriteURLIfNecessary( |
237 &loaded_url, profile, &reverse_on_redirect); | 237 &loaded_url, profile, &reverse_on_redirect); |
238 | 238 |
239 NavigationEntry* entry = new NavigationEntry( | 239 NavigationEntry* entry = new NavigationEntry( |
240 NULL, // The site instance for tabs is sent on navigation | 240 NULL, // The site instance for tabs is sent on navigation |
241 // (TabContents::GetSiteInstance). | 241 // (TabContents::GetSiteInstance). |
242 -1, | 242 -1, |
243 loaded_url, | 243 loaded_url, |
244 referrer, | 244 referrer, |
245 string16(), | 245 base::i18n::String16WithDirection(), |
246 transition); | 246 transition); |
247 entry->set_virtual_url(url); | 247 entry->set_virtual_url(url); |
248 entry->set_user_typed_url(url); | 248 entry->set_user_typed_url(url); |
249 entry->set_update_virtual_url_with_url(reverse_on_redirect); | 249 entry->set_update_virtual_url_with_url(reverse_on_redirect); |
250 return entry; | 250 return entry; |
251 } | 251 } |
252 | 252 |
253 NavigationEntry* NavigationController::GetEntryWithPageID( | 253 NavigationEntry* NavigationController::GetEntryWithPageID( |
254 SiteInstance* instance, int32 page_id) const { | 254 SiteInstance* instance, int32 page_id) const { |
255 int index = GetEntryIndexWithPageID(instance, page_id); | 255 int index = GetEntryIndexWithPageID(instance, page_id); |
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 size_t insert_index = 0; | 1234 size_t insert_index = 0; |
1235 for (int i = 0; i < max_index; i++) { | 1235 for (int i = 0; i < max_index; i++) { |
1236 // When cloning a tab, copy all entries except interstitial pages | 1236 // When cloning a tab, copy all entries except interstitial pages |
1237 if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) { | 1237 if (source.entries_[i].get()->page_type() != INTERSTITIAL_PAGE) { |
1238 entries_.insert(entries_.begin() + insert_index++, | 1238 entries_.insert(entries_.begin() + insert_index++, |
1239 linked_ptr<NavigationEntry>( | 1239 linked_ptr<NavigationEntry>( |
1240 new NavigationEntry(*source.entries_[i]))); | 1240 new NavigationEntry(*source.entries_[i]))); |
1241 } | 1241 } |
1242 } | 1242 } |
1243 } | 1243 } |
OLD | NEW |