| Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
|
| index 08c35be3e10b6e6c358fea5c2e40e1ce372414d2..f73dd411883bf6aee413cb61b6d14c5576d0274c 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
|
| @@ -51,9 +51,6 @@ WebInspector.NetworkManager = function(target)
|
| else
|
| this._networkAgent.enable();
|
|
|
| - /** @type {!Map<!SecurityAgent.CertificateId, !Promise<!NetworkAgent.CertificateDetails>>} */
|
| - this._certificateDetailsCache = new Map();
|
| -
|
| this._bypassServiceWorkerSetting = WebInspector.settings.createSetting("bypassServiceWorker", false);
|
| if (this._bypassServiceWorkerSetting.get())
|
| this._bypassServiceWorkerChanged();
|
| @@ -150,44 +147,6 @@ WebInspector.NetworkManager.prototype = {
|
| },
|
|
|
| /**
|
| - * @param {!SecurityAgent.CertificateId} certificateId
|
| - * @return {!Promise<!NetworkAgent.CertificateDetails>}
|
| - */
|
| - certificateDetailsPromise: function(certificateId)
|
| - {
|
| - var cachedPromise = this._certificateDetailsCache.get(certificateId);
|
| - if (cachedPromise)
|
| - return cachedPromise;
|
| -
|
| - /**
|
| - * @this {WebInspector.NetworkManager}
|
| - * @param {function(?NetworkAgent.CertificateDetails)} resolve
|
| - * @param {function()} reject
|
| - */
|
| - function executor(resolve, reject) {
|
| - /**
|
| - * @param {?Protocol.Error} error
|
| - * @param {?NetworkAgent.CertificateDetails} certificateDetails
|
| - */
|
| - function innerCallback(error, certificateDetails)
|
| - {
|
| - if (error) {
|
| - console.error("Unable to get certificate details from the browser (for certificate ID ", certificateId, "): ", error);
|
| - reject();
|
| - } else {
|
| - resolve(certificateDetails);
|
| - }
|
| - }
|
| - this._networkAgent.getCertificateDetails(certificateId, innerCallback);
|
| - }
|
| -
|
| - var promise = new Promise(executor.bind(this));
|
| -
|
| - this._certificateDetailsCache.set(certificateId, promise);
|
| - return promise;
|
| - },
|
| -
|
| - /**
|
| * @return {!WebInspector.Setting}
|
| */
|
| bypassServiceWorkerSetting: function()
|
| @@ -918,13 +877,22 @@ WebInspector.MultitargetNetworkManager.prototype = {
|
| },
|
|
|
| /**
|
| - * @param {!SecurityAgent.CertificateId} certificateId
|
| + * @param {string} origin
|
| + * @param {function(!Array<string>)} callback
|
| */
|
| - showCertificateViewer: function(certificateId)
|
| + getCertificate: function(origin, callback)
|
| {
|
| var target = WebInspector.targetManager.mainTarget();
|
| - if (target)
|
| - target.networkAgent().showCertificateViewer(certificateId);
|
| + target.networkAgent().getCertificate(origin, mycallback);
|
| +
|
| + /**
|
| + * @param {?Protocol.Error} error
|
| + * @param {!Array<string>} certificate
|
| + */
|
| + function mycallback(error, certificate)
|
| + {
|
| + callback(error ? [] : certificate);
|
| + }
|
| },
|
|
|
| /**
|
|
|