Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @constructor | 6 * @constructor |
| 7 * @extends {WebInspector.SDKModel} | 7 * @extends {WebInspector.SDKModel} |
| 8 * @param {!WebInspector.Target} target | 8 * @param {!WebInspector.Target} target |
| 9 */ | 9 */ |
| 10 WebInspector.SecurityModel = function(target) | 10 WebInspector.SecurityModel = function(target) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 } | 64 } |
| 65 var aScore = securityStateMap.get(a) || 0; | 65 var aScore = securityStateMap.get(a) || 0; |
| 66 var bScore = securityStateMap.get(b) || 0; | 66 var bScore = securityStateMap.get(b) || 0; |
| 67 | 67 |
| 68 return aScore - bScore; | 68 return aScore - bScore; |
| 69 } | 69 } |
| 70 | 70 |
| 71 /** | 71 /** |
| 72 * @constructor | 72 * @constructor |
| 73 * @param {!SecurityAgent.SecurityState} securityState | 73 * @param {!SecurityAgent.SecurityState} securityState |
| 74 * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations | |
| 75 * @param {?SecurityAgent.MixedContentStatus} mixedContentStatus | 74 * @param {?SecurityAgent.MixedContentStatus} mixedContentStatus |
| 76 * @param {boolean} schemeIsCryptographic | 75 * @param {boolean} schemeIsCryptographic |
| 76 * @param {boolean} pkpBypassed | |
| 77 * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations | |
| 77 */ | 78 */ |
| 78 WebInspector.PageSecurityState = function(securityState, explanations, mixedCont entStatus, schemeIsCryptographic) { | 79 WebInspector.PageSecurityState = function(securityState, mixedContentStatus, sch emeIsCryptographic, pkpBypassed, explanations) |
| 80 { | |
| 79 this.securityState = securityState; | 81 this.securityState = securityState; |
| 80 this.explanations = explanations; | |
| 81 this.mixedContentStatus = mixedContentStatus; | 82 this.mixedContentStatus = mixedContentStatus; |
| 82 this.schemeIsCryptographic = schemeIsCryptographic; | 83 this.schemeIsCryptographic = schemeIsCryptographic; |
| 84 this.pkpBypassed = pkpBypassed; | |
| 85 this.explanations = explanations; | |
| 83 } | 86 } |
| 84 | 87 |
| 85 /** | 88 /** |
| 86 * @constructor | 89 * @constructor |
| 87 * @implements {SecurityAgent.Dispatcher} | 90 * @implements {SecurityAgent.Dispatcher} |
| 88 */ | 91 */ |
| 89 WebInspector.SecurityDispatcher = function(model) | 92 WebInspector.SecurityDispatcher = function(model) |
| 90 { | 93 { |
| 91 this._model = model; | 94 this._model = model; |
| 92 } | 95 } |
| 93 | 96 |
| 94 WebInspector.SecurityDispatcher.prototype = { | 97 WebInspector.SecurityDispatcher.prototype = { |
| 95 /** | 98 /** |
| 96 * @override | 99 * @override |
| 97 * @param {!SecurityAgent.SecurityState} securityState | 100 * @param {!SecurityAgent.SecurityState} securityState |
| 101 * @param {?SecurityAgent.MixedContentStatus=} mixedContentStatus | |
|
dgozman
2016/07/06 19:01:35
Remove optional modifier here as well.
| |
| 102 * @param {boolean=} schemeIsCryptographic | |
| 103 * @param {boolean=} pkpBypassed | |
| 98 * @param {!Array<!SecurityAgent.SecurityStateExplanation>=} explanations | 104 * @param {!Array<!SecurityAgent.SecurityStateExplanation>=} explanations |
| 99 * @param {!SecurityAgent.MixedContentStatus=} mixedContentStatus | |
| 100 * @param {boolean=} schemeIsCryptographic | |
| 101 */ | 105 */ |
| 102 securityStateChanged: function(securityState, explanations, mixedContentStat us, schemeIsCryptographic) | 106 securityStateChanged: function(securityState, mixedContentStatus, schemeIsCr yptographic, pkpBypassed, explanations) |
| 103 { | 107 { |
| 104 var pageSecurityState = new WebInspector.PageSecurityState(securityState , explanations || [], mixedContentStatus || null, schemeIsCryptographic || false ); | 108 var pageSecurityState = new WebInspector.PageSecurityState(securityState , mixedContentStatus || null, schemeIsCryptographic || false, pkpBypassed || fal se, explanations || []); |
|
dgozman
2016/07/06 19:01:35
Remove:
|| null
|| false
| |
| 105 this._model.dispatchEventToListeners(WebInspector.SecurityModel.EventTyp es.SecurityStateChanged, pageSecurityState); | 109 this._model.dispatchEventToListeners(WebInspector.SecurityModel.EventTyp es.SecurityStateChanged, pageSecurityState); |
| 106 } | 110 } |
| 107 } | 111 } |
| OLD | NEW |