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 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
627 | 627 |
628 std::unique_ptr<NavigationUIData> navigation_ui_data; | 628 std::unique_ptr<NavigationUIData> navigation_ui_data; |
629 if (navigation_handle_->navigation_ui_data()) | 629 if (navigation_handle_->navigation_ui_data()) |
630 navigation_ui_data = navigation_handle_->navigation_ui_data()->Clone(); | 630 navigation_ui_data = navigation_handle_->navigation_ui_data()->Clone(); |
631 | 631 |
632 bool is_for_guests_only = | 632 bool is_for_guests_only = |
633 navigation_handle_->GetStartingSiteInstance()->GetSiteURL(). | 633 navigation_handle_->GetStartingSiteInstance()->GetSiteURL(). |
634 SchemeIs(kGuestScheme); | 634 SchemeIs(kGuestScheme); |
635 | 635 |
636 bool report_raw_headers = | 636 bool report_raw_headers = |
637 RenderFrameDevToolsAgentHost::IsNetworkHandlerEnabled(frame_tree_node_); | 637 RenderFrameDevToolsAgentHost::IsNetworkHandlerEnabled( |
638 frame_tree_node_->frame_tree()->root()); | |
dgozman
2017/01/10 17:36:31
In OOPIF world, this is not necessarily the main f
clamy
2017/01/11 13:47:29
Ok I wasn't sure if I needed to take the top level
| |
638 | 639 |
639 loader_ = NavigationURLLoader::Create( | 640 loader_ = NavigationURLLoader::Create( |
640 frame_tree_node_->navigator()->GetController()->GetBrowserContext(), | 641 frame_tree_node_->navigator()->GetController()->GetBrowserContext(), |
641 base::MakeUnique<NavigationRequestInfo>( | 642 base::MakeUnique<NavigationRequestInfo>( |
642 common_params_, begin_params_, first_party_for_cookies, | 643 common_params_, begin_params_, first_party_for_cookies, |
643 frame_tree_node_->IsMainFrame(), parent_is_main_frame, | 644 frame_tree_node_->IsMainFrame(), parent_is_main_frame, |
644 IsSecureFrame(frame_tree_node_->parent()), | 645 IsSecureFrame(frame_tree_node_->parent()), |
645 frame_tree_node_->frame_tree_node_id(), is_for_guests_only, | 646 frame_tree_node_->frame_tree_node_id(), is_for_guests_only, |
646 report_raw_headers, navigating_frame_host->GetVisibilityState()), | 647 report_raw_headers, navigating_frame_host->GetVisibilityState()), |
647 std::move(navigation_ui_data), | 648 std::move(navigation_ui_data), |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
714 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 715 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
715 | 716 |
716 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 717 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
717 common_params_, request_params_, | 718 common_params_, request_params_, |
718 is_view_source_); | 719 is_view_source_); |
719 | 720 |
720 frame_tree_node_->ResetNavigationRequest(true); | 721 frame_tree_node_->ResetNavigationRequest(true); |
721 } | 722 } |
722 | 723 |
723 } // namespace content | 724 } // namespace content |
OLD | NEW |