| 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 "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "content/browser/appcache/appcache_navigation_handle.h" | 10 #include "content/browser/appcache/appcache_navigation_handle.h" |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 } | 418 } |
| 419 | 419 |
| 420 navigation_handle_ = std::move(navigation_handle); | 420 navigation_handle_ = std::move(navigation_handle); |
| 421 | 421 |
| 422 if (!begin_params_.searchable_form_url.is_empty()) { | 422 if (!begin_params_.searchable_form_url.is_empty()) { |
| 423 navigation_handle_->set_searchable_form_url( | 423 navigation_handle_->set_searchable_form_url( |
| 424 begin_params_.searchable_form_url); | 424 begin_params_.searchable_form_url); |
| 425 navigation_handle_->set_searchable_form_encoding( | 425 navigation_handle_->set_searchable_form_encoding( |
| 426 begin_params_.searchable_form_encoding); | 426 begin_params_.searchable_form_encoding); |
| 427 } | 427 } |
| 428 |
| 429 if (common_params_.source_location) { |
| 430 navigation_handle_->set_source_location( |
| 431 common_params_.source_location.value()); |
| 432 } |
| 428 } | 433 } |
| 429 | 434 |
| 430 void NavigationRequest::TransferNavigationHandleOwnership( | 435 void NavigationRequest::TransferNavigationHandleOwnership( |
| 431 RenderFrameHostImpl* render_frame_host) { | 436 RenderFrameHostImpl* render_frame_host) { |
| 432 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); | 437 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); |
| 433 } | 438 } |
| 434 | 439 |
| 435 void NavigationRequest::OnRequestRedirected( | 440 void NavigationRequest::OnRequestRedirected( |
| 436 const net::RedirectInfo& redirect_info, | 441 const net::RedirectInfo& redirect_info, |
| 437 const scoped_refptr<ResourceResponse>& response) { | 442 const scoped_refptr<ResourceResponse>& response) { |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 823 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
| 819 | 824 |
| 820 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 825 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 821 common_params_, request_params_, | 826 common_params_, request_params_, |
| 822 is_view_source_); | 827 is_view_source_); |
| 823 | 828 |
| 824 frame_tree_node_->ResetNavigationRequest(true); | 829 frame_tree_node_->ResetNavigationRequest(true); |
| 825 } | 830 } |
| 826 | 831 |
| 827 } // namespace content | 832 } // namespace content |
| OLD | NEW |