Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1067)

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 1667163002: Add methods to NavigationHandle to allow refactoring webNavigation to use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on Camille's review. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 return; 145 return;
146 } 146 }
147 147
148 // This ensures that notifications about the end of the previous 148 // This ensures that notifications about the end of the previous
149 // navigation are sent before notifications about the start of the 149 // navigation are sent before notifications about the start of the
150 // new navigation. 150 // new navigation.
151 render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>()); 151 render_frame_host->SetNavigationHandle(scoped_ptr<NavigationHandleImpl>());
152 } 152 }
153 153
154 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( 154 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
155 validated_url, render_frame_host->frame_tree_node(), navigation_start)); 155 validated_url, render_frame_host->frame_tree_node(),
156 false, // is_synchronous
157 is_iframe_srcdoc, // is_srcdoc
158 navigation_start));
156 } 159 }
157 160
158 void NavigatorImpl::DidFailProvisionalLoadWithError( 161 void NavigatorImpl::DidFailProvisionalLoadWithError(
159 RenderFrameHostImpl* render_frame_host, 162 RenderFrameHostImpl* render_frame_host,
160 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 163 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
161 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() 164 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
162 << ", error_code: " << params.error_code 165 << ", error_code: " << params.error_code
163 << ", error_description: " << params.error_description 166 << ", error_description: " << params.error_description
164 << ", showing_repost_interstitial: " << 167 << ", showing_repost_interstitial: " <<
165 params.showing_repost_interstitial 168 params.showing_repost_interstitial
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 entry->set_should_replace_entry(pending_entry->should_replace_entry()); 1041 entry->set_should_replace_entry(pending_entry->should_replace_entry());
1039 entry->SetRedirectChain(pending_entry->GetRedirectChain()); 1042 entry->SetRedirectChain(pending_entry->GetRedirectChain());
1040 } 1043 }
1041 controller_->SetPendingEntry(std::move(entry)); 1044 controller_->SetPendingEntry(std::move(entry));
1042 if (delegate_) 1045 if (delegate_)
1043 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 1046 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
1044 } 1047 }
1045 } 1048 }
1046 1049
1047 } // namespace content 1050 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698