OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_request.h" | 5 #include "content/browser/frame_host/navigation_request.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" | 9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" |
10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 navigation_handle_->ReadyToCommitNavigation(render_frame_host); | 237 navigation_handle_->ReadyToCommitNavigation(render_frame_host); |
238 | 238 |
239 CommitNavigation(); | 239 CommitNavigation(); |
240 } | 240 } |
241 | 241 |
242 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { | 242 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { |
243 // TODO(nasko): Update the NavigationHandle creation to ensure that the | 243 // TODO(nasko): Update the NavigationHandle creation to ensure that the |
244 // proper values are specified for is_synchronous and is_srcdoc. | 244 // proper values are specified for is_synchronous and is_srcdoc. |
245 navigation_handle_ = NavigationHandleImpl::Create( | 245 navigation_handle_ = NavigationHandleImpl::Create( |
246 common_params_.url, frame_tree_node_, | 246 common_params_.url, frame_tree_node_, |
| 247 !browser_initiated_, |
247 false, // is_synchronous | 248 false, // is_synchronous |
248 false, // is_srcdoc | 249 false, // is_srcdoc |
249 common_params_.navigation_start, pending_nav_entry_id); | 250 common_params_.navigation_start, pending_nav_entry_id); |
250 } | 251 } |
251 | 252 |
252 void NavigationRequest::TransferNavigationHandleOwnership( | 253 void NavigationRequest::TransferNavigationHandleOwnership( |
253 RenderFrameHostImpl* render_frame_host) { | 254 RenderFrameHostImpl* render_frame_host) { |
254 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); | 255 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); |
255 } | 256 } |
256 | 257 |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 browser_context, navigating_frame_host->GetSiteInstance()); | 460 browser_context, navigating_frame_host->GetSiteInstance()); |
460 DCHECK(partition); | 461 DCHECK(partition); |
461 | 462 |
462 ServiceWorkerContextWrapper* service_worker_context = | 463 ServiceWorkerContextWrapper* service_worker_context = |
463 static_cast<ServiceWorkerContextWrapper*>( | 464 static_cast<ServiceWorkerContextWrapper*>( |
464 partition->GetServiceWorkerContext()); | 465 partition->GetServiceWorkerContext()); |
465 navigation_handle_->InitServiceWorkerHandle(service_worker_context); | 466 navigation_handle_->InitServiceWorkerHandle(service_worker_context); |
466 } | 467 } |
467 | 468 |
468 } // namespace content | 469 } // namespace content |
OLD | NEW |