| 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 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 663 (controller_->GetLastCommittedEntry()->GetTransitionType() & | 663 (controller_->GetLastCommittedEntry()->GetTransitionType() & |
| 664 ui::PAGE_TRANSITION_FORWARD_BACK)) { | 664 ui::PAGE_TRANSITION_FORWARD_BACK)) { |
| 665 transition_type = ui::PageTransitionFromInt( | 665 transition_type = ui::PageTransitionFromInt( |
| 666 params.transition | ui::PAGE_TRANSITION_FORWARD_BACK); | 666 params.transition | ui::PAGE_TRANSITION_FORWARD_BACK); |
| 667 } | 667 } |
| 668 | 668 |
| 669 delegate_->DidCommitProvisionalLoad(render_frame_host, | 669 delegate_->DidCommitProvisionalLoad(render_frame_host, |
| 670 params.url, | 670 params.url, |
| 671 transition_type); | 671 transition_type); |
| 672 navigation_handle->DidCommitNavigation(params, is_navigation_within_page, | 672 navigation_handle->DidCommitNavigation(params, is_navigation_within_page, |
| 673 details.previous_url, |
| 673 render_frame_host); | 674 render_frame_host); |
| 674 navigation_handle.reset(); | 675 navigation_handle.reset(); |
| 675 } | 676 } |
| 676 | 677 |
| 677 if (!did_navigate) | 678 if (!did_navigate) |
| 678 return; // No navigation happened. | 679 return; // No navigation happened. |
| 679 | 680 |
| 680 // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen | 681 // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen |
| 681 // for the appropriate notification (best) or you can add it to | 682 // for the appropriate notification (best) or you can add it to |
| 682 // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if | 683 // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1267 if (navigation_handle) | 1268 if (navigation_handle) |
| 1268 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); | 1269 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); |
| 1269 | 1270 |
| 1270 controller_->SetPendingEntry(std::move(entry)); | 1271 controller_->SetPendingEntry(std::move(entry)); |
| 1271 if (delegate_) | 1272 if (delegate_) |
| 1272 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1273 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
| 1273 } | 1274 } |
| 1274 } | 1275 } |
| 1275 | 1276 |
| 1276 } // namespace content | 1277 } // namespace content |
| OLD | NEW |