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

Side by Side Diff: content/common/navigation_params.cc

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: MixedContent::ContextType comes from the renderer; lessen Blink public code; fixed build. Created 3 years, 11 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 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/common/navigation_params.h" 5 #include "content/common/navigation_params.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/common/service_worker/service_worker_types.h" 9 #include "content/common/service_worker/service_worker_types.h"
10 #include "content/public/common/appcache_info.h" 10 #include "content/public/common/appcache_info.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 CommonNavigationParams::CommonNavigationParams( 77 CommonNavigationParams::CommonNavigationParams(
78 const CommonNavigationParams& other) = default; 78 const CommonNavigationParams& other) = default;
79 79
80 CommonNavigationParams::~CommonNavigationParams() { 80 CommonNavigationParams::~CommonNavigationParams() {
81 } 81 }
82 82
83 BeginNavigationParams::BeginNavigationParams() 83 BeginNavigationParams::BeginNavigationParams()
84 : load_flags(0), 84 : load_flags(0),
85 has_user_gesture(false), 85 has_user_gesture(false),
86 skip_service_worker(false), 86 skip_service_worker(false),
87 request_context_type(REQUEST_CONTEXT_TYPE_LOCATION) {} 87 request_context_type(REQUEST_CONTEXT_TYPE_LOCATION),
88 mixed_content_context_type(
89 blink::WebMixedContent::ContextType::Blockable) {}
88 90
89 BeginNavigationParams::BeginNavigationParams( 91 BeginNavigationParams::BeginNavigationParams(
90 std::string headers, 92 std::string headers,
91 int load_flags, 93 int load_flags,
92 bool has_user_gesture, 94 bool has_user_gesture,
93 bool skip_service_worker, 95 bool skip_service_worker,
94 RequestContextType request_context_type, 96 RequestContextType request_context_type,
97 blink::WebMixedContent::ContextType mixed_content_context_type,
95 const base::Optional<url::Origin>& initiator_origin) 98 const base::Optional<url::Origin>& initiator_origin)
96 : headers(headers), 99 : headers(headers),
97 load_flags(load_flags), 100 load_flags(load_flags),
98 has_user_gesture(has_user_gesture), 101 has_user_gesture(has_user_gesture),
99 skip_service_worker(skip_service_worker), 102 skip_service_worker(skip_service_worker),
100 request_context_type(request_context_type), 103 request_context_type(request_context_type),
104 mixed_content_context_type(mixed_content_context_type),
101 initiator_origin(initiator_origin) {} 105 initiator_origin(initiator_origin) {}
102 106
103 BeginNavigationParams::BeginNavigationParams( 107 BeginNavigationParams::BeginNavigationParams(
104 const BeginNavigationParams& other) = default; 108 const BeginNavigationParams& other) = default;
105 109
106 BeginNavigationParams::~BeginNavigationParams() {} 110 BeginNavigationParams::~BeginNavigationParams() {}
107 111
108 StartNavigationParams::StartNavigationParams() 112 StartNavigationParams::StartNavigationParams()
109 : transferred_request_child_id(-1), 113 : transferred_request_child_id(-1),
110 transferred_request_request_id(-1) { 114 transferred_request_request_id(-1) {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 const RequestNavigationParams& request_params) 198 const RequestNavigationParams& request_params)
195 : common_params(common_params), 199 : common_params(common_params),
196 start_params(start_params), 200 start_params(start_params),
197 request_params(request_params) { 201 request_params(request_params) {
198 } 202 }
199 203
200 NavigationParams::~NavigationParams() { 204 NavigationParams::~NavigationParams() {
201 } 205 }
202 206
203 } // namespace content 207 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698