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

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

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: 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 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/child_process_security_policy_impl.h" 9 #include "content/browser/child_process_security_policy_impl.h"
10 #include "content/browser/devtools/render_frame_devtools_agent_host.h" 10 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 common_params_.url); 292 common_params_.url);
293 293
294 // Inform the NavigationHandle that the navigation will commit. 294 // Inform the NavigationHandle that the navigation will commit.
295 navigation_handle_->ReadyToCommitNavigation(render_frame_host); 295 navigation_handle_->ReadyToCommitNavigation(render_frame_host);
296 296
297 CommitNavigation(); 297 CommitNavigation();
298 } 298 }
299 299
300 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { 300 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) {
301 // TODO(nasko): Update the NavigationHandle creation to ensure that the 301 // TODO(nasko): Update the NavigationHandle creation to ensure that the
302 // proper values are specified for is_same_page and is_srcdoc. 302 // proper values are specified for is_same_page.
303 navigation_handle_ = NavigationHandleImpl::Create( 303 navigation_handle_ = NavigationHandleImpl::Create(
304 common_params_.url, frame_tree_node_, !browser_initiated_, 304 common_params_.url, frame_tree_node_, !browser_initiated_,
305 false, // is_same_page 305 false, // is_same_page
306 false, // is_srcdoc
307 common_params_.navigation_start, pending_nav_entry_id, 306 common_params_.navigation_start, pending_nav_entry_id,
308 false); // started_in_context_menu 307 false); // started_in_context_menu
309 } 308 }
310 309
311 void NavigationRequest::TransferNavigationHandleOwnership( 310 void NavigationRequest::TransferNavigationHandleOwnership(
312 RenderFrameHostImpl* render_frame_host) { 311 RenderFrameHostImpl* render_frame_host) {
313 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); 312 render_frame_host->SetNavigationHandle(std::move(navigation_handle_));
314 } 313 }
315 314
316 void NavigationRequest::OnRequestRedirected( 315 void NavigationRequest::OnRequestRedirected(
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); 588 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
590 589
591 render_frame_host->CommitNavigation(response_.get(), std::move(body_), 590 render_frame_host->CommitNavigation(response_.get(), std::move(body_),
592 common_params_, request_params_, 591 common_params_, request_params_,
593 is_view_source_); 592 is_view_source_);
594 593
595 frame_tree_node_->ResetNavigationRequest(true); 594 frame_tree_node_->ResetNavigationRequest(true);
596 } 595 }
597 596
598 } // namespace content 597 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698