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

Side by Side Diff: Source/core/inspector/InspectorResourceAgent.cpp

Issue 1289203009: Switch InspectorResourceAgent to use Neutral instead of Http for SecurityState. (2/4) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 headers = buildObjectForHeaders(response.httpHeaderFields()); 239 headers = buildObjectForHeaders(response.httpHeaderFields());
240 240
241 int64_t encodedDataLength = response.resourceLoadInfo() ? response.resourceL oadInfo()->encodedDataLength : -1; 241 int64_t encodedDataLength = response.resourceLoadInfo() ? response.resourceL oadInfo()->encodedDataLength : -1;
242 242
243 TypeBuilder::Security::SecurityState::Enum securityState = TypeBuilder::Secu rity::SecurityState::Unknown; 243 TypeBuilder::Security::SecurityState::Enum securityState = TypeBuilder::Secu rity::SecurityState::Unknown;
244 switch (response.securityStyle()) { 244 switch (response.securityStyle()) {
245 case ResourceResponse::SecurityStyleUnknown: 245 case ResourceResponse::SecurityStyleUnknown:
246 securityState = TypeBuilder::Security::SecurityState::Unknown; 246 securityState = TypeBuilder::Security::SecurityState::Unknown;
247 break; 247 break;
248 case ResourceResponse::SecurityStyleUnauthenticated: 248 case ResourceResponse::SecurityStyleUnauthenticated:
249 securityState = TypeBuilder::Security::SecurityState::Http; 249 securityState = TypeBuilder::Security::SecurityState::Neutral;
250 break; 250 break;
251 case ResourceResponse::SecurityStyleAuthenticationBroken: 251 case ResourceResponse::SecurityStyleAuthenticationBroken:
252 securityState = TypeBuilder::Security::SecurityState::Insecure; 252 securityState = TypeBuilder::Security::SecurityState::Insecure;
253 break; 253 break;
254 case ResourceResponse::SecurityStyleWarning: 254 case ResourceResponse::SecurityStyleWarning:
255 securityState = TypeBuilder::Security::SecurityState::Warning; 255 securityState = TypeBuilder::Security::SecurityState::Warning;
256 break; 256 break;
257 case ResourceResponse::SecurityStyleAuthenticated: 257 case ResourceResponse::SecurityStyleAuthenticated:
258 securityState = TypeBuilder::Security::SecurityState::Secure; 258 securityState = TypeBuilder::Security::SecurityState::Secure;
259 break; 259 break;
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinish edReplayXHRFired) 988 , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinish edReplayXHRFired)
989 { 989 {
990 } 990 }
991 991
992 bool InspectorResourceAgent::shouldForceCORSPreflight() 992 bool InspectorResourceAgent::shouldForceCORSPreflight()
993 { 993 {
994 return m_state->getBoolean(ResourceAgentState::cacheDisabled); 994 return m_state->getBoolean(ResourceAgentState::cacheDisabled);
995 } 995 }
996 996
997 } // namespace blink 997 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698