summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 23:50:45 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 23:50:45 +0000
commit10256cf8f476d489cf16d485d33ca87e63c6013c (patch)
tree1955f3c8820ee36b3e55ec1f100a27666b24ecc4 /chrome/browser/resources
parentfd360352df2f5dba90758d94ee3d10ff20f57184 (diff)
downloadchromium_src-10256cf8f476d489cf16d485d33ca87e63c6013c.zip
chromium_src-10256cf8f476d489cf16d485d33ca87e63c6013c.tar.gz
chromium_src-10256cf8f476d489cf16d485d33ca87e63c6013c.tar.bz2
Hide packed hosted apps in chrome://extensions .
BUG=53222 TEST=Manualy installed extensions, hosted apps,a nd packaged apps. Review URL: http://codereview.chromium.org/3425001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/extensions_ui.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index fe29ead..4a7c035 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -359,6 +359,7 @@ var extensionDataFormat = {
'wantsFileAccess': 'false',
'allowFileAccess': 'false',
'allow_reload': true,
+ 'is_hosted_app': false,
'order': 1,
'options_url': 'options.html',
'icon': 'relative-path-to-icon.png',
@@ -403,6 +404,7 @@ var extensionDataFormat = {
'wantsFileAccess': 'false',
'allowFileAccess': 'false',
'allow_reload': false,
+ 'is_hosted_app': false,
'order': 2,
'icon': '',
'content_scripts': [
@@ -871,7 +873,7 @@ document.addEventListener('DOMContentLoaded', requestExtensionsData);
i18n-content="viewIncognito">(INCOGNITO)</span>
</span>
</li>
- <li i18n-content="inspectPopupsInstructions"
+ <li i18n-content="inspectPopupsInstructions"
class="inspectPopupNote" jsdisplay="hasPopupAction">
INSPECT POPUP INSRUCTIONS
</li>
@@ -916,8 +918,7 @@ document.addEventListener('DOMContentLoaded', requestExtensionsData);
href="javascript:void 0;"
i18n-content="options"
>OPTIONS</a>
- <label
- jsdisplay="enabled">
+ <label jsdisplay="enabled && !is_hosted_app">
<input type="checkbox"
jsvalues=".extensionId:id;.enabled:enabled"
jsdisplay="enabled"