Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_handle_impl.h" | 5 #include "content/browser/frame_host/navigation_handle_impl.h" |
| 6 | 6 |
| 7 #include "base/debug/dump_without_crashing.h" | 7 #include "base/debug/dump_without_crashing.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "content/browser/appcache/appcache_navigation_handle.h" | 9 #include "content/browser/appcache/appcache_navigation_handle.h" |
| 10 #include "content/browser/appcache/appcache_service_impl.h" | 10 #include "content/browser/appcache/appcache_service_impl.h" |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 527 if (result != NavigationThrottle::DEFER) | 527 if (result != NavigationThrottle::DEFER) |
| 528 RunCompleteCallback(result); | 528 RunCompleteCallback(result); |
| 529 } | 529 } |
| 530 | 530 |
| 531 void NavigationHandleImpl::ReadyToCommitNavigation( | 531 void NavigationHandleImpl::ReadyToCommitNavigation( |
| 532 RenderFrameHostImpl* render_frame_host) { | 532 RenderFrameHostImpl* render_frame_host) { |
| 533 DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host); | 533 DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host); |
| 534 render_frame_host_ = render_frame_host; | 534 render_frame_host_ = render_frame_host; |
| 535 state_ = READY_TO_COMMIT; | 535 state_ = READY_TO_COMMIT; |
| 536 | 536 |
| 537 if (!IsRendererDebugURL(url_)) | 537 if (!IsRendererDebugURL(url_) && |
| 538 !IsSamePage()) | |
|
nasko
2017/01/13 02:51:10
This should fit just fine on the previous line.
arthursonzogni
2017/01/13 15:18:37
Done.
| |
| 538 GetDelegate()->ReadyToCommitNavigation(this); | 539 GetDelegate()->ReadyToCommitNavigation(this); |
| 539 } | 540 } |
| 540 | 541 |
| 541 void NavigationHandleImpl::DidCommitNavigation( | 542 void NavigationHandleImpl::DidCommitNavigation( |
| 542 const FrameHostMsg_DidCommitProvisionalLoad_Params& params, | 543 const FrameHostMsg_DidCommitProvisionalLoad_Params& params, |
| 543 bool same_page, | 544 bool same_page, |
| 544 RenderFrameHostImpl* render_frame_host) { | 545 RenderFrameHostImpl* render_frame_host) { |
| 545 DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host); | 546 DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host); |
| 546 DCHECK_EQ(frame_tree_node_, render_frame_host->frame_tree_node()); | 547 DCHECK_EQ(frame_tree_node_, render_frame_host->frame_tree_node()); |
| 547 CHECK_EQ(url_, params.url); | 548 CHECK_EQ(url_, params.url); |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 806 throttles_.push_back(std::move(ancestor_throttle)); | 807 throttles_.push_back(std::move(ancestor_throttle)); |
| 807 | 808 |
| 808 if (throttles_to_register.size() > 0) { | 809 if (throttles_to_register.size() > 0) { |
| 809 throttles_.insert(throttles_.begin(), throttles_to_register.begin(), | 810 throttles_.insert(throttles_.begin(), throttles_to_register.begin(), |
| 810 throttles_to_register.end()); | 811 throttles_to_register.end()); |
| 811 throttles_to_register.weak_clear(); | 812 throttles_to_register.weak_clear(); |
| 812 } | 813 } |
| 813 } | 814 } |
| 814 | 815 |
| 815 } // namespace content | 816 } // namespace content |
| OLD | NEW |