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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 return; | 152 return; |
153 } | 153 } |
154 | 154 |
155 // This ensures that notifications about the end of the previous | 155 // This ensures that notifications about the end of the previous |
156 // navigation are sent before notifications about the start of the | 156 // navigation are sent before notifications about the start of the |
157 // new navigation. | 157 // new navigation. |
158 render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>()); | 158 render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>()); |
159 } | 159 } |
160 | 160 |
161 render_frame_host->SetNavigationHandle( | 161 render_frame_host->SetNavigationHandle( |
162 NavigationHandleImpl::Create(url, is_main_frame, delegate_)); | 162 NavigationHandleImpl::Create(validated_url, is_main_frame, delegate_)); |
163 } | 163 } |
164 | 164 |
165 void NavigatorImpl::DidFailProvisionalLoadWithError( | 165 void NavigatorImpl::DidFailProvisionalLoadWithError( |
166 RenderFrameHostImpl* render_frame_host, | 166 RenderFrameHostImpl* render_frame_host, |
167 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 167 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
168 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() | 168 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() |
169 << ", error_code: " << params.error_code | 169 << ", error_code: " << params.error_code |
170 << ", error_description: " << params.error_description | 170 << ", error_description: " << params.error_description |
171 << ", showing_repost_interstitial: " << | 171 << ", showing_repost_interstitial: " << |
172 params.showing_repost_interstitial | 172 params.showing_repost_interstitial |
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
946 entry->set_should_replace_entry(pending_entry->should_replace_entry()); | 946 entry->set_should_replace_entry(pending_entry->should_replace_entry()); |
947 entry->SetRedirectChain(pending_entry->GetRedirectChain()); | 947 entry->SetRedirectChain(pending_entry->GetRedirectChain()); |
948 } | 948 } |
949 controller_->SetPendingEntry(entry.Pass()); | 949 controller_->SetPendingEntry(entry.Pass()); |
950 if (delegate_) | 950 if (delegate_) |
951 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 951 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
952 } | 952 } |
953 } | 953 } |
954 | 954 |
955 } // namespace content | 955 } // namespace content |
OLD | NEW |