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

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

Issue 2765643002: Revert of PlzNavigate: send SourceLocation when mixed content is found (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 }
433 } 428 }
434 429
435 void NavigationRequest::TransferNavigationHandleOwnership( 430 void NavigationRequest::TransferNavigationHandleOwnership(
436 RenderFrameHostImpl* render_frame_host) { 431 RenderFrameHostImpl* render_frame_host) {
437 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); 432 render_frame_host->SetNavigationHandle(std::move(navigation_handle_));
438 } 433 }
439 434
440 void NavigationRequest::OnRequestRedirected( 435 void NavigationRequest::OnRequestRedirected(
441 const net::RedirectInfo& redirect_info, 436 const net::RedirectInfo& redirect_info,
442 const scoped_refptr<ResourceResponse>& response) { 437 const scoped_refptr<ResourceResponse>& response) {
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); 818 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
824 819
825 render_frame_host->CommitNavigation(response_.get(), std::move(body_), 820 render_frame_host->CommitNavigation(response_.get(), std::move(body_),
826 common_params_, request_params_, 821 common_params_, request_params_,
827 is_view_source_); 822 is_view_source_);
828 823
829 frame_tree_node_->ResetNavigationRequest(true); 824 frame_tree_node_->ResetNavigationRequest(true);
830 } 825 }
831 826
832 } // namespace content 827 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698