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

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

Issue 2355023002: Preserving Content-Type header from http request in OpenURL path. (Closed)
Patch Set: Rebasing... Created 4 years, 2 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
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/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 std::vector<GURL> rest_of_chain = transfer_url_chain; 456 std::vector<GURL> rest_of_chain = transfer_url_chain;
457 rest_of_chain.pop_back(); 457 rest_of_chain.pop_back();
458 458
459 transferring_render_frame_host->frame_tree_node() 459 transferring_render_frame_host->frame_tree_node()
460 ->navigator() 460 ->navigator()
461 ->RequestTransferURL( 461 ->RequestTransferURL(
462 transferring_render_frame_host, transfer_url, nullptr, rest_of_chain, 462 transferring_render_frame_host, transfer_url, nullptr, rest_of_chain,
463 referrer, page_transition, global_request_id, 463 referrer, page_transition, global_request_id,
464 should_replace_current_entry, 464 should_replace_current_entry,
465 transfer_navigation_handle_->IsPost() ? "POST" : "GET", 465 transfer_navigation_handle_->IsPost() ? "POST" : "GET",
466 transfer_navigation_handle_->resource_request_body()); 466 transfer_navigation_handle_->resource_request_body(),
467 std::string() /* extra_headers */);
467 468
468 // If the navigation continued, the NavigationHandle should have been 469 // If the navigation continued, the NavigationHandle should have been
469 // transfered to a RenderFrameHost. In the other cases, it should be cleared. 470 // transfered to a RenderFrameHost. In the other cases, it should be cleared.
470 // If the NavigationHandle wasn't claimed, this will lead to the cancelation 471 // If the NavigationHandle wasn't claimed, this will lead to the cancelation
471 // of the request in the network stack. 472 // of the request in the network stack.
472 transfer_navigation_handle_.reset(); 473 transfer_navigation_handle_.reset();
473 474
474 // If the navigation in the new renderer did not start, inform the 475 // If the navigation in the new renderer did not start, inform the
475 // FrameTreeNode that it stopped loading. 476 // FrameTreeNode that it stopped loading.
476 if (!frame_tree_node_->IsLoading() && frame_tree_node_was_loading) 477 if (!frame_tree_node_->IsLoading() && frame_tree_node_was_loading)
(...skipping 2191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2668 resolved_url)) { 2669 resolved_url)) {
2669 DCHECK(!dest_instance || 2670 DCHECK(!dest_instance ||
2670 dest_instance == render_frame_host_->GetSiteInstance()); 2671 dest_instance == render_frame_host_->GetSiteInstance());
2671 return false; 2672 return false;
2672 } 2673 }
2673 2674
2674 return true; 2675 return true;
2675 } 2676 }
2676 2677
2677 } // namespace content 2678 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698