Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/security/SecurityModel.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/security/SecurityModel.js b/third_party/WebKit/Source/devtools/front_end/security/SecurityModel.js |
| index 56730c68612c7612d9871894e7e7390612325d22..dd0094b2de541ab40a3cbe806e9698069dd36be0 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/security/SecurityModel.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/security/SecurityModel.js |
| @@ -71,15 +71,18 @@ WebInspector.SecurityModel.SecurityStateComparator = function(a, b) |
| /** |
| * @constructor |
| * @param {!SecurityAgent.SecurityState} securityState |
| - * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations |
| * @param {?SecurityAgent.MixedContentStatus} mixedContentStatus |
| * @param {boolean} schemeIsCryptographic |
| + * @param {boolean} pkpBypassed |
| + * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations |
| */ |
| -WebInspector.PageSecurityState = function(securityState, explanations, mixedContentStatus, schemeIsCryptographic) { |
| +WebInspector.PageSecurityState = function(securityState, mixedContentStatus, schemeIsCryptographic, pkpBypassed, explanations) |
| +{ |
| this.securityState = securityState; |
| - this.explanations = explanations; |
| this.mixedContentStatus = mixedContentStatus; |
| this.schemeIsCryptographic = schemeIsCryptographic; |
| + this.pkpBypassed = pkpBypassed; |
| + this.explanations = explanations; |
| } |
| /** |
| @@ -95,13 +98,14 @@ WebInspector.SecurityDispatcher.prototype = { |
| /** |
| * @override |
| * @param {!SecurityAgent.SecurityState} securityState |
| - * @param {!Array<!SecurityAgent.SecurityStateExplanation>=} explanations |
| - * @param {!SecurityAgent.MixedContentStatus=} mixedContentStatus |
| + * @param {?SecurityAgent.MixedContentStatus=} mixedContentStatus |
|
dgozman
2016/07/06 19:01:35
Remove optional modifier here as well.
|
| * @param {boolean=} schemeIsCryptographic |
| + * @param {boolean=} pkpBypassed |
| + * @param {!Array<!SecurityAgent.SecurityStateExplanation>=} explanations |
| */ |
| - securityStateChanged: function(securityState, explanations, mixedContentStatus, schemeIsCryptographic) |
| + securityStateChanged: function(securityState, mixedContentStatus, schemeIsCryptographic, pkpBypassed, explanations) |
| { |
| - var pageSecurityState = new WebInspector.PageSecurityState(securityState, explanations || [], mixedContentStatus || null, schemeIsCryptographic || false); |
| + var pageSecurityState = new WebInspector.PageSecurityState(securityState, mixedContentStatus || null, schemeIsCryptographic || false, pkpBypassed || false, explanations || []); |
|
dgozman
2016/07/06 19:01:35
Remove:
|| null
|| false
|
| this._model.dispatchEventToListeners(WebInspector.SecurityModel.EventTypes.SecurityStateChanged, pageSecurityState); |
| } |
| } |