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

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

Issue 2756913002: Revert of PlzNavigate: Enforce 'frame-src' CSP on the browser. (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
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/navigation_entry_impl.h" 5 #include "content/browser/frame_host/navigation_entry_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <queue> 9 #include <queue>
10 #include <utility> 10 #include <utility>
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 if (IsBrowserSideNavigationEnabled()) 679 if (IsBrowserSideNavigationEnabled())
680 method = frame_entry.method(); 680 method = frame_entry.method();
681 else 681 else
682 method = (post_body.get() || GetHasPostData()) ? "POST" : "GET"; 682 method = (post_body.get() || GetHasPostData()) ? "POST" : "GET";
683 683
684 return CommonNavigationParams( 684 return CommonNavigationParams(
685 dest_url, dest_referrer, GetTransitionType(), navigation_type, 685 dest_url, dest_referrer, GetTransitionType(), navigation_type,
686 !IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type, 686 !IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type,
687 GetBaseURLForDataURL(), GetHistoryURLForDataURL(), previews_state, 687 GetBaseURLForDataURL(), GetHistoryURLForDataURL(), previews_state,
688 navigation_start, method, post_body ? post_body : post_data_, 688 navigation_start, method, post_body ? post_body : post_data_,
689 base::Optional<SourceLocation>(), 689 base::Optional<SourceLocation>());
690 CSPDisposition::CHECK /* should_check_main_world_csp */);
691 } 690 }
692 691
693 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams() 692 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
694 const { 693 const {
695 return StartNavigationParams(extra_headers(), 694 return StartNavigationParams(extra_headers(),
696 transferred_global_request_id().child_id, 695 transferred_global_request_id().child_id,
697 transferred_global_request_id().request_id); 696 transferred_global_request_id().request_id);
698 } 697 }
699 698
700 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams( 699 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 return node; 952 return node;
954 953
955 // Enqueue any children and keep looking. 954 // Enqueue any children and keep looking.
956 for (const auto& child : node->children) 955 for (const auto& child : node->children)
957 work_queue.push(child.get()); 956 work_queue.push(child.get());
958 } 957 }
959 return nullptr; 958 return nullptr;
960 } 959 }
961 960
962 } // namespace content 961 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/interstitial_page_navigator_impl.cc ('k') | content/browser/frame_host/navigation_handle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698