diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 19:15:21 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 19:15:21 +0000 |
| commit | f83773f72845ed180a23dcbbfa9afbc3c295f758 (patch) | |
| tree | b5b6e561a0367be32f1785609ea97ab9e648e857 /chrome/test | |
| parent | d1ca70cfc72762d6ff489f2558e6eb1333cbabf2 (diff) | |
| download | chromium_src-f83773f72845ed180a23dcbbfa9afbc3c295f758.zip chromium_src-f83773f72845ed180a23dcbbfa9afbc3c295f758.tar.gz chromium_src-f83773f72845ed180a23dcbbfa9afbc3c295f758.tar.bz2 | |
Display disabled apps with grayed out images on the NTP. Call the re-enable logic when the user tries to launch the app. This also adds a chrome://extension-icon endpoint that provides easy access to extension and app icons.
BUG=61270
TEST=ExtensionIconSourceTest.IconsLoaded
Review URL: http://codereview.chromium.org/6495002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
11 files changed, 116 insertions, 3 deletions
diff --git a/chrome/test/data/extensions/api_test/icons/extension_no_permission/24.png b/chrome/test/data/extensions/api_test/icons/extension_no_permission/24.png Binary files differnew file mode 100644 index 0000000..79d2452 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_no_permission/24.png diff --git a/chrome/test/data/extensions/api_test/icons/extension_no_permission/index.html b/chrome/test/data/extensions/api_test/icons/extension_no_permission/index.html new file mode 100644 index 0000000..47d3506 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_no_permission/index.html @@ -0,0 +1,25 @@ +<html> +<head> +<title>Not Loaded</title> +<script type="text/javascript"> + +function load(e) { + document.title = "Loaded"; +} + +function error(e) { + document.title = "Not Loaded"; +} + +</script> + +</head> +<body> + +<img src="chrome://extension-icon/apocjbpjpkghdepdngjlknfpmabcmlao/24/0" + testsize="24px" + onload="load(event);" + onerror="error(event);"/> + +</body> +</head> diff --git a/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json b/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json new file mode 100644 index 0000000..8b56002 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json @@ -0,0 +1,10 @@ +{ + "description": "Extension with no management permission", + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCk/WWuKvmfJx/Q0ldDrtXsP7JbFOPtP7rfasiAlmQoJpW4ECHpqTqj/i/E68MVLzAagp790vUeSgyJF4U0P3eHf8e6pskyrEz0+UYt6PElEIjyOnMu5JY3c6l7NdeJK5DVI0SIsspeA1HmxUQ+7CCv7A4fTCwwp1UNjQsG56feeQIDAQAB", + "name": "test", + "version": "0.1", + "permissions": [], + "icons": { + "24": "24.png" + } +} diff --git a/chrome/test/data/extensions/api_test/icons/extension_with_permission/128.png b/chrome/test/data/extensions/api_test/icons/extension_with_permission/128.png Binary files differnew file mode 100644 index 0000000..569d785 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_with_permission/128.png diff --git a/chrome/test/data/extensions/api_test/icons/extension_with_permission/24.png b/chrome/test/data/extensions/api_test/icons/extension_with_permission/24.png Binary files differnew file mode 100644 index 0000000..79d2452 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_with_permission/24.png diff --git a/chrome/test/data/extensions/api_test/icons/extension_with_permission/32.png b/chrome/test/data/extensions/api_test/icons/extension_with_permission/32.png Binary files differnew file mode 100644 index 0000000..2828d25 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_with_permission/32.png diff --git a/chrome/test/data/extensions/api_test/icons/extension_with_permission/index.html b/chrome/test/data/extensions/api_test/icons/extension_with_permission/index.html new file mode 100644 index 0000000..9642617 --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_with_permission/index.html @@ -0,0 +1,63 @@ +<script type="text/javascript"> + +var TOTAL = 4; +var count = 0; + +function load(e) { + if (++count < TOTAL) + return; + + // Good. All the images have loaded. Now make sure they're the correct size. + var imgs = document.getElementsByTagName('img'); + for (var x = 0; x < imgs.length; x++) { + var style = getComputedStyle(imgs[x]); + var size = imgs[x].getAttribute('testsize'); + if (style.height != size || style.width != size) { + document.title = "Incorrect size on " + imgs[x].src; + return; + } + } + + // Success! + document.title = "Loaded"; +} + +function error(e) { + // We failed to load an image that should have loaded. + document.title = "Not loaded: " + e.target.src; +} + +</script> + +<!-- Tests loading a standard 128px icon. --> +<img src="chrome://extension-icon/gbmgkahjioeacddebbnengilkgbkhodg/128/0" + testsize="128px" + onload="load(event);" + onerror="error(event);"/> + +<!-- + Tests loading a standard 48px icon with a MATCH_SMALLER. + This should not be resized to 48px. +--> +<img src="chrome://extension-icon/gbmgkahjioeacddebbnengilkgbkhodg/48/2" + testsize="32px" + onload="load(event);" + onerror="error(event);"/> + +<!-- + Tests loading a standard 32px icon, grayscale. We assume that we + actually got a grayscale image back here. +--> +<img src="chrome://extension-icon/gbmgkahjioeacddebbnengilkgbkhodg/32/1?grayscale=true" + testsize="32px" + onload="load(event);" + onerror="error(event);"/> + +<!-- + Tests loading a 16px by resizing the 32px version (MATCH_BIGGER). + This should be resized to 16px. +--> +<img src="chrome://extension-icon/gbmgkahjioeacddebbnengilkgbkhodg/16/1" + testsize="16px" + onload="load(event);" + onerror="error(event);"/> diff --git a/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json b/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json new file mode 100644 index 0000000..e2bb86e --- /dev/null +++ b/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json @@ -0,0 +1,12 @@ +{ + "description": "Extension with management permission", + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuBACa7q+sBalhnUT3lsGuuZ9PEzfoJCBoPJdCS0cfQGqAlgbBsKKqnLLgrUuK9g23PYcGTOryxnJ0eLr3Wl+gkV+CcZ4i64qfBSPt+WCTO4F9XHnqJVWRDjNY+7q0ytf8X6wdgA6ebTx4OE1t52nudNhGgYcFkRYwNAjwV5PKzQIDAQAB", + "name": "test", + "version": "0.1", + "permissions": [ "management" ], + "icons": { + "128": "128.png", + "32": "32.png", + "24": "24.png" + } +} diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json index ab9e575..43bc2f8 100644 --- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json +++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json @@ -38,5 +38,6 @@ } ], "hasPopupAction": false, - "homepageUrl": "" + "homepageUrl": "", + "icon": "chrome://extension-icon/behllobkkfkfnphdnhnkndlbkcpglgmj/48/1" } diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json index 078d343..5be7ec9 100644 --- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json +++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json @@ -28,5 +28,6 @@ } ], "hasPopupAction": false, - "homepageUrl": "" + "homepageUrl": "", + "icon": "chrome://extension-icon/hpiknbiabeeppbpihjehijgoemciehgk/48/1" } diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json index 7cfb429..62e5722 100644 --- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json +++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json @@ -15,5 +15,6 @@ "content_scripts": [], "views": [], "hasPopupAction": false, - "homepageUrl": "" + "homepageUrl": "", + "icon": "chrome://extension-icon/bjafgdebaacbbbecmhlhpofkepfkgcpa/48/1" } |
