Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/sources/SourcesSearchScope.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/sources/SourcesSearchScope.js b/third_party/WebKit/Source/devtools/front_end/sources/SourcesSearchScope.js |
| index 641d357201eb8f158d168a1d85edd6c3b9882829..f26f3f94475cdfd7467fb8cfe5180448840f3231 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/sources/SourcesSearchScope.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/sources/SourcesSearchScope.js |
| @@ -74,24 +74,13 @@ Sources.SourcesSearchScope = class { |
| * @return {!Array.<!Workspace.Project>} |
| */ |
| _projects() { |
| - /** |
| - * @param {!Workspace.Project} project |
| - * @return {boolean} |
| - */ |
| - function filterOutServiceProjects(project) { |
| - return project.type() !== Workspace.projectTypes.Service; |
| - } |
| - |
| - /** |
| - * @param {!Workspace.Project} project |
| - * @return {boolean} |
| - */ |
| - function filterOutContentScriptsIfNeeded(project) { |
| - return Common.moduleSetting('searchInContentScripts').get() || |
| - project.type() !== Workspace.projectTypes.ContentScripts; |
| - } |
| + var searchInDynamicScriptsAndExtensions = Common.moduleSetting('searchInDynamicScriptsAndExtensions').get(); |
| - return Workspace.workspace.projects().filter(filterOutServiceProjects).filter(filterOutContentScriptsIfNeeded); |
| + return Workspace.workspace.projects() |
| + .filter(project => project.type() !== Workspace.projectTypes.Service) |
|
dgozman
2017/02/22 20:17:06
I personally don't like chaining multiple calls do
lushnikov
2017/02/22 21:22:37
Done.
|
| + .filter(project => searchInDynamicScriptsAndExtensions || !project.isServiceProject()) |
| + .filter( |
| + project => searchInDynamicScriptsAndExtensions || project.type() !== Workspace.projectTypes.ContentScripts); |
| } |
| /** |
| @@ -283,13 +272,4 @@ Sources.SourcesSearchScope = class { |
| stopSearch() { |
| ++this._searchId; |
| } |
| - |
| - /** |
| - * @override |
| - * @param {!Workspace.ProjectSearchConfig} searchConfig |
| - * @return {!Sources.FileBasedSearchResultsPane} |
| - */ |
| - createSearchResultsPane(searchConfig) { |
| - return new Sources.FileBasedSearchResultsPane(searchConfig); |
| - } |
| }; |