OLD | NEW |
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 Loading... |
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 */); |
690 } | 691 } |
691 | 692 |
692 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams() | 693 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams() |
693 const { | 694 const { |
694 return StartNavigationParams(extra_headers(), | 695 return StartNavigationParams(extra_headers(), |
695 transferred_global_request_id().child_id, | 696 transferred_global_request_id().child_id, |
696 transferred_global_request_id().request_id); | 697 transferred_global_request_id().request_id); |
697 } | 698 } |
698 | 699 |
699 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams( | 700 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams( |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
952 return node; | 953 return node; |
953 | 954 |
954 // Enqueue any children and keep looking. | 955 // Enqueue any children and keep looking. |
955 for (const auto& child : node->children) | 956 for (const auto& child : node->children) |
956 work_queue.push(child.get()); | 957 work_queue.push(child.get()); |
957 } | 958 } |
958 return nullptr; | 959 return nullptr; |
959 } | 960 } |
960 | 961 |
961 } // namespace content | 962 } // namespace content |
OLD | NEW |