| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/navigation_controller_impl.h" | 5 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/string_number_conversions.h" // Temporary | 10 #include "base/strings/string_number_conversions.h" // Temporary |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 bool reverse_on_redirect = false; | 156 bool reverse_on_redirect = false; |
| 157 BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary( | 157 BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary( |
| 158 &loaded_url, browser_context, &reverse_on_redirect); | 158 &loaded_url, browser_context, &reverse_on_redirect); |
| 159 | 159 |
| 160 NavigationEntryImpl* entry = new NavigationEntryImpl( | 160 NavigationEntryImpl* entry = new NavigationEntryImpl( |
| 161 NULL, // The site instance for tabs is sent on navigation | 161 NULL, // The site instance for tabs is sent on navigation |
| 162 // (WebContents::GetSiteInstance). | 162 // (WebContents::GetSiteInstance). |
| 163 -1, | 163 -1, |
| 164 loaded_url, | 164 loaded_url, |
| 165 referrer, | 165 referrer, |
| 166 string16(), | 166 base::string16(), |
| 167 transition, | 167 transition, |
| 168 is_renderer_initiated); | 168 is_renderer_initiated); |
| 169 entry->SetVirtualURL(url); | 169 entry->SetVirtualURL(url); |
| 170 entry->set_user_typed_url(url); | 170 entry->set_user_typed_url(url); |
| 171 entry->set_update_virtual_url_with_url(reverse_on_redirect); | 171 entry->set_update_virtual_url_with_url(reverse_on_redirect); |
| 172 entry->set_extra_headers(extra_headers); | 172 entry->set_extra_headers(extra_headers); |
| 173 return entry; | 173 return entry; |
| 174 } | 174 } |
| 175 | 175 |
| 176 // static | 176 // static |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 nav_entry->set_should_replace_entry(true); | 347 nav_entry->set_should_replace_entry(true); |
| 348 pending_entry_ = nav_entry; | 348 pending_entry_ = nav_entry; |
| 349 } else { | 349 } else { |
| 350 pending_entry_ = entry; | 350 pending_entry_ = entry; |
| 351 pending_entry_index_ = current_index; | 351 pending_entry_index_ = current_index; |
| 352 | 352 |
| 353 // The title of the page being reloaded might have been removed in the | 353 // The title of the page being reloaded might have been removed in the |
| 354 // meanwhile, so we need to revert to the default title upon reload and | 354 // meanwhile, so we need to revert to the default title upon reload and |
| 355 // invalidate the previously cached title (SetTitle will do both). | 355 // invalidate the previously cached title (SetTitle will do both). |
| 356 // See Chromium issue 96041. | 356 // See Chromium issue 96041. |
| 357 pending_entry_->SetTitle(string16()); | 357 pending_entry_->SetTitle(base::string16()); |
| 358 | 358 |
| 359 pending_entry_->SetTransitionType(PAGE_TRANSITION_RELOAD); | 359 pending_entry_->SetTransitionType(PAGE_TRANSITION_RELOAD); |
| 360 } | 360 } |
| 361 | 361 |
| 362 NavigateToPendingEntry(reload_type); | 362 NavigateToPendingEntry(reload_type); |
| 363 } | 363 } |
| 364 } | 364 } |
| 365 | 365 |
| 366 void NavigationControllerImpl::CancelPendingReload() { | 366 void NavigationControllerImpl::CancelPendingReload() { |
| 367 DCHECK(pending_reload_ != NO_RELOAD); | 367 DCHECK(pending_reload_ != NO_RELOAD); |
| (...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1683 } | 1683 } |
| 1684 } | 1684 } |
| 1685 } | 1685 } |
| 1686 | 1686 |
| 1687 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 1687 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
| 1688 const base::Callback<base::Time()>& get_timestamp_callback) { | 1688 const base::Callback<base::Time()>& get_timestamp_callback) { |
| 1689 get_timestamp_callback_ = get_timestamp_callback; | 1689 get_timestamp_callback_ = get_timestamp_callback; |
| 1690 } | 1690 } |
| 1691 | 1691 |
| 1692 } // namespace content | 1692 } // namespace content |
| OLD | NEW |