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 672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
683 // subframe navigation entries. | 683 // subframe navigation entries. |
684 if (IsBrowserSideNavigationEnabled()) | 684 if (IsBrowserSideNavigationEnabled()) |
685 method = frame_entry.method(); | 685 method = frame_entry.method(); |
686 else | 686 else |
687 method = (post_body.get() || GetHasPostData()) ? "POST" : "GET"; | 687 method = (post_body.get() || GetHasPostData()) ? "POST" : "GET"; |
688 | 688 |
689 return CommonNavigationParams( | 689 return CommonNavigationParams( |
690 dest_url, dest_referrer, GetTransitionType(), navigation_type, | 690 dest_url, dest_referrer, GetTransitionType(), navigation_type, |
691 !IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type, | 691 !IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type, |
692 GetBaseURLForDataURL(), GetHistoryURLForDataURL(), previews_state, | 692 GetBaseURLForDataURL(), GetHistoryURLForDataURL(), previews_state, |
693 navigation_start, method, post_body ? post_body : post_data_); | 693 navigation_start, method, post_body ? post_body : post_data_, |
| 694 false /* should_bypass_main_world_CSP */); |
694 } | 695 } |
695 | 696 |
696 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams() | 697 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams() |
697 const { | 698 const { |
698 return StartNavigationParams(extra_headers(), | 699 return StartNavigationParams(extra_headers(), |
699 transferred_global_request_id().child_id, | 700 transferred_global_request_id().child_id, |
700 transferred_global_request_id().request_id); | 701 transferred_global_request_id().request_id); |
701 } | 702 } |
702 | 703 |
703 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams( | 704 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams( |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
950 return node; | 951 return node; |
951 | 952 |
952 // Enqueue any children and keep looking. | 953 // Enqueue any children and keep looking. |
953 for (auto* child : node->children) | 954 for (auto* child : node->children) |
954 work_queue.push(child); | 955 work_queue.push(child); |
955 } | 956 } |
956 return nullptr; | 957 return nullptr; |
957 } | 958 } |
958 | 959 |
959 } // namespace content | 960 } // namespace content |
OLD | NEW |