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

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

Issue 2345053006: Remove IsSynchronous API from NavigationHandle. (Closed)
Patch Set: Addressed review comments. Created 4 years, 1 month 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/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 NavigationEntryImpl* pending_entry = controller_->GetPendingEntry(); 200 NavigationEntryImpl* pending_entry = controller_->GetPendingEntry();
201 if (pending_entry) { 201 if (pending_entry) {
202 is_renderer_initiated = pending_entry->is_renderer_initiated(); 202 is_renderer_initiated = pending_entry->is_renderer_initiated();
203 pending_nav_entry_id = pending_entry->GetUniqueID(); 203 pending_nav_entry_id = pending_entry->GetUniqueID();
204 started_from_context_menu = pending_entry->has_started_from_context_menu(); 204 started_from_context_menu = pending_entry->has_started_from_context_menu();
205 } 205 }
206 206
207 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( 207 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
208 validated_url, render_frame_host->frame_tree_node(), 208 validated_url, render_frame_host->frame_tree_node(),
209 is_renderer_initiated, 209 is_renderer_initiated,
210 false, // is_synchronous 210 false, // is_same_page
211 is_iframe_srcdoc, // is_srcdoc 211 is_iframe_srcdoc, // is_srcdoc
212 navigation_start, pending_nav_entry_id, started_from_context_menu)); 212 navigation_start, pending_nav_entry_id, started_from_context_menu));
213 } 213 }
214 214
215 void NavigatorImpl::DidFailProvisionalLoadWithError( 215 void NavigatorImpl::DidFailProvisionalLoadWithError(
216 RenderFrameHostImpl* render_frame_host, 216 RenderFrameHostImpl* render_frame_host,
217 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 217 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
218 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() 218 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
219 << ", error_code: " << params.error_code 219 << ", error_code: " << params.error_code
220 << ", error_description: " << params.error_description 220 << ", error_description: " << params.error_description
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 if (navigation_handle) 1251 if (navigation_handle)
1252 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); 1252 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
1253 1253
1254 controller_->SetPendingEntry(std::move(entry)); 1254 controller_->SetPendingEntry(std::move(entry));
1255 if (delegate_) 1255 if (delegate_)
1256 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 1256 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
1257 } 1257 }
1258 } 1258 }
1259 1259
1260 } // namespace content 1260 } // 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