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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebURLResponse.cpp

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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 { 298 {
299 // FIXME: getSecurityInfo is misnamed. 299 // FIXME: getSecurityInfo is misnamed.
300 return m_private->m_resourceResponse->getSecurityInfo(); 300 return m_private->m_resourceResponse->getSecurityInfo();
301 } 301 }
302 302
303 void WebURLResponse::setSecurityInfo(const WebCString& securityInfo) 303 void WebURLResponse::setSecurityInfo(const WebCString& securityInfo)
304 { 304 {
305 m_private->m_resourceResponse->setSecurityInfo(securityInfo); 305 m_private->m_resourceResponse->setSecurityInfo(securityInfo);
306 } 306 }
307 307
308 void WebURLResponse::setHasMajorCertificateErrors(bool value)
309 {
310 m_private->m_resourceResponse->setHasMajorCertificateErrors(value);
311 }
312
313 WebURLResponse::SecurityStyle WebURLResponse::securityStyle() const 308 WebURLResponse::SecurityStyle WebURLResponse::securityStyle() const
314 { 309 {
315 return static_cast<SecurityStyle>(m_private->m_resourceResponse->securitySty le()); 310 return static_cast<SecurityStyle>(m_private->m_resourceResponse->securitySty le());
316 } 311 }
317 312
318 void WebURLResponse::setSecurityStyle(SecurityStyle securityStyle) 313 void WebURLResponse::setSecurityStyle(SecurityStyle securityStyle)
319 { 314 {
320 m_private->m_resourceResponse->setSecurityStyle(static_cast<ResourceResponse ::SecurityStyle>(securityStyle)); 315 m_private->m_resourceResponse->setSecurityStyle(static_cast<ResourceResponse ::SecurityStyle>(securityStyle));
321 } 316 }
322 317
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 // Subclasses may call this directly so a self-assignment check is needed 484 // Subclasses may call this directly so a self-assignment check is needed
490 // here as well as in the public assign method. 485 // here as well as in the public assign method.
491 if (m_private == p) 486 if (m_private == p)
492 return; 487 return;
493 if (m_private) 488 if (m_private)
494 m_private->dispose(); 489 m_private->dispose();
495 m_private = p; 490 m_private = p;
496 } 491 }
497 492
498 } // namespace blink 493 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698