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

Side by Side Diff: third_party/WebKit/Source/platform/network/ResourceResponse.h

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 PassRefPtr<ResourceLoadInfo> resourceLoadInfo() const; 154 PassRefPtr<ResourceLoadInfo> resourceLoadInfo() const;
155 void setResourceLoadInfo(PassRefPtr<ResourceLoadInfo>); 155 void setResourceLoadInfo(PassRefPtr<ResourceLoadInfo>);
156 156
157 HTTPVersion httpVersion() const { return m_httpVersion; } 157 HTTPVersion httpVersion() const { return m_httpVersion; }
158 void setHTTPVersion(HTTPVersion version) { m_httpVersion = version; } 158 void setHTTPVersion(HTTPVersion version) { m_httpVersion = version; }
159 159
160 const CString& getSecurityInfo() const { return m_securityInfo; } 160 const CString& getSecurityInfo() const { return m_securityInfo; }
161 void setSecurityInfo(const CString& securityInfo) { m_securityInfo = securit yInfo; } 161 void setSecurityInfo(const CString& securityInfo) { m_securityInfo = securit yInfo; }
162 162
163 bool hasMajorCertificateErrors() const { return m_hasMajorCertificateErrors; }
164 void setHasMajorCertificateErrors(bool hasMajorCertificateErrors) { m_hasMaj orCertificateErrors = hasMajorCertificateErrors; }
165
166 SecurityStyle securityStyle() const { return m_securityStyle; } 163 SecurityStyle securityStyle() const { return m_securityStyle; }
167 void setSecurityStyle(SecurityStyle securityStyle) { m_securityStyle = secur ityStyle; } 164 void setSecurityStyle(SecurityStyle securityStyle) { m_securityStyle = secur ityStyle; }
168 165
169 const SecurityDetails* securityDetails() const { return &m_securityDetails; } 166 const SecurityDetails* securityDetails() const { return &m_securityDetails; }
170 void setSecurityDetails(const String& protocol, const String& keyExchange, c onst String& cipher, const String& mac, int certId); 167 void setSecurityDetails(const String& protocol, const String& keyExchange, c onst String& cipher, const String& mac, int certId);
171 168
172 long long appCacheID() const { return m_appCacheID; } 169 long long appCacheID() const { return m_appCacheID; }
173 void setAppCacheID(long long id) { m_appCacheID = id; } 170 void setAppCacheID(long long id) { m_appCacheID = id; }
174 171
175 const KURL& appCacheManifestURL() const { return m_appCacheManifestURL; } 172 const KURL& appCacheManifestURL() const { return m_appCacheManifestURL; }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 mutable double m_age; 261 mutable double m_age;
265 mutable double m_date; 262 mutable double m_date;
266 mutable double m_expires; 263 mutable double m_expires;
267 mutable double m_lastModified; 264 mutable double m_lastModified;
268 265
269 // An opaque value that contains some information regarding the security of 266 // An opaque value that contains some information regarding the security of
270 // the connection for this request, such as SSL connection info (empty 267 // the connection for this request, such as SSL connection info (empty
271 // string if not over HTTPS). 268 // string if not over HTTPS).
272 CString m_securityInfo; 269 CString m_securityInfo;
273 270
274 // True if the resource was retrieved by the embedder in spite of
275 // certificate errors.
276 bool m_hasMajorCertificateErrors;
277
278 // The security style of the resource. 271 // The security style of the resource.
279 // This only contains a valid value when the DevTools Network domain is 272 // This only contains a valid value when the DevTools Network domain is
280 // enabled. (Otherwise, it contains a default value of Unknown.) 273 // enabled. (Otherwise, it contains a default value of Unknown.)
281 SecurityStyle m_securityStyle; 274 SecurityStyle m_securityStyle;
282 275
283 // Security details of this request's connection. 276 // Security details of this request's connection.
284 // If m_securityStyle is Unknown or Unauthenticated, this does not contain 277 // If m_securityStyle is Unknown or Unauthenticated, this does not contain
285 // valid data. 278 // valid data.
286 SecurityDetails m_securityDetails; 279 SecurityDetails m_securityDetails;
287 280
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 String m_mimeType; 350 String m_mimeType;
358 long long m_expectedContentLength; 351 long long m_expectedContentLength;
359 String m_textEncodingName; 352 String m_textEncodingName;
360 String m_suggestedFilename; 353 String m_suggestedFilename;
361 int m_httpStatusCode; 354 int m_httpStatusCode;
362 String m_httpStatusText; 355 String m_httpStatusText;
363 OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders; 356 OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
364 time_t m_lastModifiedDate; 357 time_t m_lastModifiedDate;
365 RefPtr<ResourceLoadTiming> m_resourceLoadTiming; 358 RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
366 CString m_securityInfo; 359 CString m_securityInfo;
367 bool m_hasMajorCertificateErrors;
368 ResourceResponse::SecurityStyle m_securityStyle; 360 ResourceResponse::SecurityStyle m_securityStyle;
369 ResourceResponse::SecurityDetails m_securityDetails; 361 ResourceResponse::SecurityDetails m_securityDetails;
370 ResourceResponse::HTTPVersion m_httpVersion; 362 ResourceResponse::HTTPVersion m_httpVersion;
371 long long m_appCacheID; 363 long long m_appCacheID;
372 KURL m_appCacheManifestURL; 364 KURL m_appCacheManifestURL;
373 bool m_isMultipartPayload; 365 bool m_isMultipartPayload;
374 bool m_wasFetchedViaSPDY; 366 bool m_wasFetchedViaSPDY;
375 bool m_wasNpnNegotiated; 367 bool m_wasNpnNegotiated;
376 bool m_wasAlternateProtocolAvailable; 368 bool m_wasAlternateProtocolAvailable;
377 bool m_wasFetchedViaProxy; 369 bool m_wasFetchedViaProxy;
378 bool m_wasFetchedViaServiceWorker; 370 bool m_wasFetchedViaServiceWorker;
379 bool m_wasFallbackRequiredByServiceWorker; 371 bool m_wasFallbackRequiredByServiceWorker;
380 WebServiceWorkerResponseType m_serviceWorkerResponseType; 372 WebServiceWorkerResponseType m_serviceWorkerResponseType;
381 KURL m_originalURLViaServiceWorker; 373 KURL m_originalURLViaServiceWorker;
382 int64 m_responseTime; 374 int64 m_responseTime;
383 String m_remoteIPAddress; 375 String m_remoteIPAddress;
384 unsigned short m_remotePort; 376 unsigned short m_remotePort;
385 String m_downloadedFilePath; 377 String m_downloadedFilePath;
386 RefPtr<BlobDataHandle> m_downloadedFileHandle; 378 RefPtr<BlobDataHandle> m_downloadedFileHandle;
387 }; 379 };
388 380
389 } // namespace blink 381 } // namespace blink
390 382
391 #endif // ResourceResponse_h 383 #endif // ResourceResponse_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698