Chromium Code Reviews| Index: chrome/browser/resources/extensions/extension_list.js |
| diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js |
| index d3de6bce2d1b25b36cf7b8a6cda156eeb679721c..c1a6e9ba35aceb796f645c7645fe81fb4481279c 100644 |
| --- a/chrome/browser/resources/extensions/extension_list.js |
| +++ b/chrome/browser/resources/extensions/extension_list.js |
| @@ -58,8 +58,8 @@ |
| * updateRequiredByPolicy: boolean, |
| * version: string, |
| * views: Array<{renderViewId: number, renderProcessId: number, |
| - * path: string, incognito: boolean, |
| - * generatedBackgroundPage: boolean}>, |
| + * url: string, incognito: boolean, |
| + * type: chrome.developerPrivate.ViewType}>, |
| * wantsErrorCollection: boolean, |
| * wantsFileAccess: boolean, |
| * warnings: (Array|undefined)}} |
| @@ -729,8 +729,18 @@ cr.define('extensions', function() { |
| link.removeEventListener('click', link.clickHandler); |
| extension.views.forEach(function(view, i) { |
|
Dan Beam
2015/03/12 00:23:15
nit: if it fits, i think this is purdier
var Vi
Devlin
2015/03/12 15:38:14
But you're missing the second view.type == - shoul
Dan Beam
2015/03/12 16:41:17
oh, doh. if it doesn't save lines don't bother, b
Devlin
2015/03/12 19:53:35
Done.
|
| - var displayName = view.generatedBackgroundPage ? |
| - loadTimeData.getString('backgroundPage') : view.path; |
| + if (view.type == chrome.developerPrivate.ViewType.EXTENSION_DIALOG || |
| + view.type == chrome.developerPrivate.ViewType.EXTENSION_POPUP) |
| + return; |
| + var displayName; |
| + if (view.url.indexOf('chrome-extension://') == 0) { |
| + var pathOffset = 'chrome-extension://'.length + 32 + 1; |
| + displayName = view.url.substring(pathOffset); |
| + if (displayName == '_generated_background_page.html') |
| + displayName = loadTimeData.getString('backgroundPage'); |
| + } else { |
| + displayName = view.url; |
| + } |
| var label = displayName + |
| (view.incognito ? |
| ' ' + loadTimeData.getString('viewIncognito') : '') + |