Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js |
| index a1b49efe4536bf81bfb30d527ee073c31a2bb153..1d4595dcc2d95b56d65486901d8a418678ee12d4 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js |
| @@ -481,8 +481,8 @@ Extensions.ExtensionServer = class extends Common.Object { |
| uiSourceCodes = |
| uiSourceCodes.concat(Workspace.workspace.uiSourceCodesForProjectType(Workspace.projectTypes.ContentScripts)); |
| uiSourceCodes.forEach(pushResourceData.bind(this)); |
| - for (var target of SDK.targetManager.targets(SDK.Target.Capability.DOM)) |
| - SDK.ResourceTreeModel.fromTarget(target).forAllResources(pushResourceData.bind(this)); |
| + for (var resourceTreeModel of SDK.targetManager.models(SDK.ResourceTreeModel)) |
| + resourceTreeModel.forAllResources(pushResourceData.bind(this)); |
| return resources.valuesArray(); |
| } |
| @@ -915,7 +915,7 @@ Extensions.ExtensionServer = class extends Common.Object { |
| frame = resolveURLToFrame(options.frameURL); |
| } else { |
| var target = SDK.targetManager.mainTarget(); |
| - var resourceTreeModel = target && SDK.ResourceTreeModel.fromTarget(target); |
| + var resourceTreeModel = target ? target.model(SDK.ResourceTreeModel) : null; |
|
caseq
2017/03/29 17:48:42
nit: keep && for consistency.
dgozman
2017/04/01 00:22:44
Done.
|
| frame = resourceTreeModel && resourceTreeModel.mainFrame; |
| } |
| if (!frame) { |