Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js b/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| index 63927d4d4080cb57572d6265fb4114e38034ef87..dbe2d77d38fe5e1d7388b2c378f16e42ec186cb6 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| @@ -169,10 +169,11 @@ WebInspector.SecurityPanel.prototype = { |
| var originState = {}; |
| originState.securityState = securityState; |
| + var networkManager = request.networkManager(); |
| var securityDetails = request.securityDetails(); |
| - if (securityDetails) { |
| + if (securityDetails && networkManager) { |
|
dgozman
2016/07/05 17:54:31
networkManager should not be ever null
eostroukhov-old
2016/07/06 20:37:53
Acknowledged.
|
| originState.securityDetails = securityDetails; |
| - originState.certificateDetailsPromise = request.target().networkManager.certificateDetailsPromise(securityDetails.certificateId); |
| + originState.certificateDetailsPromise = networkManager.certificateDetailsPromise(securityDetails.certificateId); |
|
dgozman
2016/07/05 17:54:31
I'd just inline request.networkManager() here.
eostroukhov-old
2016/07/06 20:37:53
Done.
|
| } |
| this._origins.set(origin, originState); |
| @@ -249,8 +250,11 @@ WebInspector.SecurityPanel.prototype = { |
| this._target = target; |
| target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._onMainFrameNavigated, this); |
| - target.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.ResponseReceived, this._onResponseReceived, this); |
| - target.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestFinished, this); |
| + var networkManager = WebInspector.NetworkManager.fromTarget(target); |
| + if (networkManager) { |
| + networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.ResponseReceived, this._onResponseReceived, this); |
| + networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestFinished, this); |
| + } |
| var securityModel = WebInspector.SecurityModel.fromTarget(target); |
| securityModel.addEventListener(WebInspector.SecurityModel.EventTypes.SecurityStateChanged, this._onSecurityStateChanged, this); |