summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension.h
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 15:22:11 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 15:22:11 +0000
commit5351dbc9a7ec62aa9db14e6040856f56a9d01c0f (patch)
tree75310029e7bfdb333e11b117f4af1a5f98c7d955 /chrome/common/extensions/extension.h
parent5e38ff3d12a83ae0925ef00c3da37ce9718ac29d (diff)
downloadchromium_src-5351dbc9a7ec62aa9db14e6040856f56a9d01c0f.zip
chromium_src-5351dbc9a7ec62aa9db14e6040856f56a9d01c0f.tar.gz
chromium_src-5351dbc9a7ec62aa9db14e6040856f56a9d01c0f.tar.bz2
When the browser doesn't have connectivity to a hosted app, display a prettier error page by default.
TEST=none BUG=41281 Review URL: http://codereview.chromium.org/3174024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension.h')
-rw-r--r--chrome/common/extensions/extension.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index cad7dbd..e9a25cc 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -323,14 +323,18 @@ class Extension {
// Returns an absolute path to the given icon inside of the extension. Returns
// an empty FilePath if the extension does not have that icon.
- ExtensionResource GetIconPath(Icons icon);
+ ExtensionResource GetIconResource(Icons icon);
// Looks for an extension icon of dimension |icon|. If not found, checks if
// the next larger size exists (until one is found or the end is reached). If
// an icon is found, the path is returned in |resource| and the dimension
// found is returned to the caller (as function return value).
// NOTE: |resource| is not guaranteed to be non-empty.
- Icons GetIconPathAllowLargerSize(ExtensionResource* resource, Icons icon);
+ Icons GetIconResourceAllowLargerSize(ExtensionResource* resource, Icons icon);
+
+ // See GetIconPathAllowLargerSize. Returns a chrome-extension:// URL
+ // instead of an ExtensionResource.
+ GURL GetIconUrlAllowLargerSize(Icons icon);
const DictionaryValue* manifest_value() const {
return manifest_value_.get();
@@ -440,6 +444,11 @@ class Extension {
// kPermissionNames).
bool IsAPIPermission(const std::string& permission);
+ // Utility functions to get the icon relative path used to create an
+ // ExtensionResource or URL.
+ std::string GetIconPath(Icons icon);
+ Icons GetIconPathAllowLargerSize(std::string* path, Icons icon);
+
// The absolute path to the directory the extension is stored in.
FilePath path_;