| 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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 (controller_->GetLastCommittedEntry()->GetTransitionType() & | 702 (controller_->GetLastCommittedEntry()->GetTransitionType() & |
| 703 ui::PAGE_TRANSITION_FORWARD_BACK)) { | 703 ui::PAGE_TRANSITION_FORWARD_BACK)) { |
| 704 transition_type = ui::PageTransitionFromInt( | 704 transition_type = ui::PageTransitionFromInt( |
| 705 params.transition | ui::PAGE_TRANSITION_FORWARD_BACK); | 705 params.transition | ui::PAGE_TRANSITION_FORWARD_BACK); |
| 706 } | 706 } |
| 707 | 707 |
| 708 delegate_->DidCommitProvisionalLoad(render_frame_host, | 708 delegate_->DidCommitProvisionalLoad(render_frame_host, |
| 709 params.url, | 709 params.url, |
| 710 transition_type); | 710 transition_type); |
| 711 navigation_handle->DidCommitNavigation(params, details.did_replace_entry, | 711 navigation_handle->DidCommitNavigation(params, details.did_replace_entry, |
| 712 details.previous_url, | 712 details.previous_url, details.type, |
| 713 render_frame_host); | 713 render_frame_host); |
| 714 navigation_handle.reset(); | 714 navigation_handle.reset(); |
| 715 } | 715 } |
| 716 | 716 |
| 717 if (!did_navigate) | 717 if (!did_navigate) |
| 718 return; // No navigation happened. | 718 return; // No navigation happened. |
| 719 | 719 |
| 720 // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen | 720 // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen |
| 721 // for the appropriate notification (best) or you can add it to | 721 // for the appropriate notification (best) or you can add it to |
| 722 // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if | 722 // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if |
| (...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1321 if (navigation_handle) | 1321 if (navigation_handle) |
| 1322 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); | 1322 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); |
| 1323 | 1323 |
| 1324 controller_->SetPendingEntry(std::move(entry)); | 1324 controller_->SetPendingEntry(std::move(entry)); |
| 1325 if (delegate_) | 1325 if (delegate_) |
| 1326 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1326 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
| 1327 } | 1327 } |
| 1328 } | 1328 } |
| 1329 | 1329 |
| 1330 } // namespace content | 1330 } // namespace content |
| OLD | NEW |