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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 } | 207 } |
208 | 208 |
209 if (delegate_) | 209 if (delegate_) |
210 delegate_->DidFailProvisionalLoadWithError(render_frame_host, params); | 210 delegate_->DidFailProvisionalLoadWithError(render_frame_host, params); |
211 } | 211 } |
212 | 212 |
213 void NavigatorImpl::DidFailLoadWithError( | 213 void NavigatorImpl::DidFailLoadWithError( |
214 RenderFrameHostImpl* render_frame_host, | 214 RenderFrameHostImpl* render_frame_host, |
215 const GURL& url, | 215 const GURL& url, |
216 int error_code, | 216 int error_code, |
217 const base::string16& error_description) { | 217 const base::string16& error_description, |
| 218 bool was_ignored_by_handler) { |
218 if (delegate_) { | 219 if (delegate_) { |
219 delegate_->DidFailLoadWithError( | 220 delegate_->DidFailLoadWithError( |
220 render_frame_host, url, error_code, | 221 render_frame_host, url, error_code, |
221 error_description); | 222 error_description, was_ignored_by_handler); |
222 } | 223 } |
223 } | 224 } |
224 | 225 |
225 bool NavigatorImpl::NavigateToEntry( | 226 bool NavigatorImpl::NavigateToEntry( |
226 FrameTreeNode* frame_tree_node, | 227 FrameTreeNode* frame_tree_node, |
227 const FrameNavigationEntry& frame_entry, | 228 const FrameNavigationEntry& frame_entry, |
228 const NavigationEntryImpl& entry, | 229 const NavigationEntryImpl& entry, |
229 NavigationController::ReloadType reload_type, | 230 NavigationController::ReloadType reload_type, |
230 bool is_same_document_history_load) { | 231 bool is_same_document_history_load) { |
231 TRACE_EVENT0("browser,navigation", "NavigatorImpl::NavigateToEntry"); | 232 TRACE_EVENT0("browser,navigation", "NavigatorImpl::NavigateToEntry"); |
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
923 entry->set_should_replace_entry(pending_entry->should_replace_entry()); | 924 entry->set_should_replace_entry(pending_entry->should_replace_entry()); |
924 entry->SetRedirectChain(pending_entry->GetRedirectChain()); | 925 entry->SetRedirectChain(pending_entry->GetRedirectChain()); |
925 } | 926 } |
926 controller_->SetPendingEntry(entry); | 927 controller_->SetPendingEntry(entry); |
927 if (delegate_) | 928 if (delegate_) |
928 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 929 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
929 } | 930 } |
930 } | 931 } |
931 | 932 |
932 } // namespace content | 933 } // namespace content |
OLD | NEW |