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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

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: Addressed all jam@ latest comments. 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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 std::unique_ptr<FileReaderLoader> m_loader; 204 std::unique_ptr<FileReaderLoader> m_loader;
205 RefPtr<SharedBuffer> m_rawData; 205 RefPtr<SharedBuffer> m_rawData;
206 }; 206 };
207 207
208 KURL urlWithoutFragment(const KURL& url) { 208 KURL urlWithoutFragment(const KURL& url) {
209 KURL result = url; 209 KURL result = url;
210 result.removeFragmentIdentifier(); 210 result.removeFragmentIdentifier();
211 return result; 211 return result;
212 } 212 }
213 213
214 String mixedContentTypeForContextType( 214 String mixedContentTypeForContextType(WebMixedContentContextType contextType) {
215 WebMixedContent::ContextType contextType) {
216 switch (contextType) { 215 switch (contextType) {
217 case WebMixedContent::ContextType::NotMixedContent: 216 case WebMixedContentContextType::NotMixedContent:
218 return protocol::Network::Request::MixedContentTypeEnum::None; 217 return protocol::Network::Request::MixedContentTypeEnum::None;
219 case WebMixedContent::ContextType::Blockable: 218 case WebMixedContentContextType::Blockable:
220 return protocol::Network::Request::MixedContentTypeEnum::Blockable; 219 return protocol::Network::Request::MixedContentTypeEnum::Blockable;
221 case WebMixedContent::ContextType::OptionallyBlockable: 220 case WebMixedContentContextType::OptionallyBlockable:
222 case WebMixedContent::ContextType::ShouldBeBlockable: 221 case WebMixedContentContextType::ShouldBeBlockable:
223 return protocol::Network::Request::MixedContentTypeEnum:: 222 return protocol::Network::Request::MixedContentTypeEnum::
224 OptionallyBlockable; 223 OptionallyBlockable;
225 } 224 }
226 225
227 return protocol::Network::Request::MixedContentTypeEnum::None; 226 return protocol::Network::Request::MixedContentTypeEnum::None;
228 } 227 }
229 228
230 String resourcePriorityJSON(ResourceLoadPriority priority) { 229 String resourcePriorityJSON(ResourceLoadPriority priority) {
231 switch (priority) { 230 switch (priority) {
232 case ResourceLoadPriorityVeryLow: 231 case ResourceLoadPriorityVeryLow:
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 m_isRecalculatingStyle(false), 1523 m_isRecalculatingStyle(false),
1525 m_removeFinishedReplayXHRTimer( 1524 m_removeFinishedReplayXHRTimer(
1526 this, 1525 this,
1527 &InspectorNetworkAgent::removeFinishedReplayXHRFired) {} 1526 &InspectorNetworkAgent::removeFinishedReplayXHRFired) {}
1528 1527
1529 bool InspectorNetworkAgent::shouldForceCORSPreflight() { 1528 bool InspectorNetworkAgent::shouldForceCORSPreflight() {
1530 return m_state->booleanProperty(NetworkAgentState::cacheDisabled, false); 1529 return m_state->booleanProperty(NetworkAgentState::cacheDisabled, false);
1531 } 1530 }
1532 1531
1533 } // namespace blink 1532 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698