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.PanelWithSidebar} | 7 * @extends {WebInspector.PanelWithSidebar} |
| 8 * @implements {WebInspector.TargetManager.Observer} | 8 * @implements {WebInspector.TargetManager.Observer} |
| 9 */ | 9 */ |
| 10 WebInspector.SecurityPanel = function() | 10 WebInspector.SecurityPanel = function() |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 if (oldSecurityState !== originState.securityState) { | 162 if (oldSecurityState !== originState.securityState) { |
| 163 this._sidebarTree.updateOrigin(origin, securityState); | 163 this._sidebarTree.updateOrigin(origin, securityState); |
| 164 if (originState.originView) | 164 if (originState.originView) |
| 165 originState.originView.setSecurityState(securityState); | 165 originState.originView.setSecurityState(securityState); |
| 166 } | 166 } |
| 167 } else { | 167 } else { |
| 168 // TODO(lgarron): Store a (deduplicated) list of different security details we have seen. https://crbug.com/503170 | 168 // TODO(lgarron): Store a (deduplicated) list of different security details we have seen. https://crbug.com/503170 |
| 169 var originState = {}; | 169 var originState = {}; |
| 170 originState.securityState = securityState; | 170 originState.securityState = securityState; |
| 171 | 171 |
| 172 var networkManager = request.networkManager(); | |
| 172 var securityDetails = request.securityDetails(); | 173 var securityDetails = request.securityDetails(); |
| 173 if (securityDetails) { | 174 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.
| |
| 174 originState.securityDetails = securityDetails; | 175 originState.securityDetails = securityDetails; |
| 175 originState.certificateDetailsPromise = request.target().network Manager.certificateDetailsPromise(securityDetails.certificateId); | 176 originState.certificateDetailsPromise = networkManager.certifica teDetailsPromise(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.
| |
| 176 } | 177 } |
| 177 | 178 |
| 178 this._origins.set(origin, originState); | 179 this._origins.set(origin, originState); |
| 179 | 180 |
| 180 this._sidebarTree.addOrigin(origin, securityState); | 181 this._sidebarTree.addOrigin(origin, securityState); |
| 181 | 182 |
| 182 // Don't construct the origin view yet (let it happen lazily). | 183 // Don't construct the origin view yet (let it happen lazily). |
| 183 } | 184 } |
| 184 }, | 185 }, |
| 185 | 186 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 * @param {!WebInspector.Target} target | 243 * @param {!WebInspector.Target} target |
| 243 */ | 244 */ |
| 244 targetAdded: function(target) | 245 targetAdded: function(target) |
| 245 { | 246 { |
| 246 if (this._target) | 247 if (this._target) |
| 247 return; | 248 return; |
| 248 | 249 |
| 249 this._target = target; | 250 this._target = target; |
| 250 | 251 |
| 251 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel .EventTypes.MainFrameNavigated, this._onMainFrameNavigated, this); | 252 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel .EventTypes.MainFrameNavigated, this._onMainFrameNavigated, this); |
| 252 target.networkManager.addEventListener(WebInspector.NetworkManager.Event Types.ResponseReceived, this._onResponseReceived, this); | 253 var networkManager = WebInspector.NetworkManager.fromTarget(target); |
| 253 target.networkManager.addEventListener(WebInspector.NetworkManager.Event Types.RequestFinished, this._onRequestFinished, this); | 254 if (networkManager) { |
| 255 networkManager.addEventListener(WebInspector.NetworkManager.EventTyp es.ResponseReceived, this._onResponseReceived, this); | |
| 256 networkManager.addEventListener(WebInspector.NetworkManager.EventTyp es.RequestFinished, this._onRequestFinished, this); | |
| 257 } | |
| 254 | 258 |
| 255 var securityModel = WebInspector.SecurityModel.fromTarget(target); | 259 var securityModel = WebInspector.SecurityModel.fromTarget(target); |
| 256 securityModel.addEventListener(WebInspector.SecurityModel.EventTypes.Sec urityStateChanged, this._onSecurityStateChanged, this); | 260 securityModel.addEventListener(WebInspector.SecurityModel.EventTypes.Sec urityStateChanged, this._onSecurityStateChanged, this); |
| 257 }, | 261 }, |
| 258 | 262 |
| 259 /** | 263 /** |
| 260 * @override | 264 * @override |
| 261 * @param {!WebInspector.Target} target | 265 * @param {!WebInspector.Target} target |
| 262 */ | 266 */ |
| 263 targetRemoved: function(target) | 267 targetRemoved: function(target) |
| (...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 989 row.createChild("div").textContent = key; | 993 row.createChild("div").textContent = key; |
| 990 | 994 |
| 991 var valueDiv = row.createChild("div"); | 995 var valueDiv = row.createChild("div"); |
| 992 if (typeof value === "string") { | 996 if (typeof value === "string") { |
| 993 valueDiv.textContent = value; | 997 valueDiv.textContent = value; |
| 994 } else { | 998 } else { |
| 995 valueDiv.appendChild(value); | 999 valueDiv.appendChild(value); |
| 996 } | 1000 } |
| 997 } | 1001 } |
| 998 } | 1002 } |
| OLD | NEW |