summaryrefslogtreecommitdiffstats
path: root/extensions/shell/common
diff options
context:
space:
mode:
authorasargent <asargent@chromium.org>2015-01-08 10:10:55 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-08 18:11:55 +0000
commitf7f7e3b6b2be0ccc4c0db1dbcd9b85a546716c75 (patch)
tree2a306306eb779c5683590ab850d3ef9b4ff3e1a5 /extensions/shell/common
parentb473df2a2b68d52ec3e0b041042d9e54ff86560b (diff)
downloadchromium_src-f7f7e3b6b2be0ccc4c0db1dbcd9b85a546716c75.zip
chromium_src-f7f7e3b6b2be0ccc4c0db1dbcd9b85a546716c75.tar.gz
chromium_src-f7f7e3b6b2be0ccc4c0db1dbcd9b85a546716c75.tar.bz2
Provide default implementation of ExtensionsClient::GetBrowserImagePaths
Right now ChromeExtensionsClient has the only real implementation of this function, and it returns the icons for: 1) the extension itself (the top-level icons key in the manifest) 2) page/browser actions 3) theme images This patch moves to having a default implementation in ExtensionsClient of GetBrowserImagePaths which returns the paths for (1), leaving (2) and (3) speficic to ChromeExtensionsClient. We need to do this to enable the Unpacker class to move from chrome/ to extensions/, because the unpacker does some validation checks on the paths returned by GetBrowserImagePaths and has tests for that validation we want to move out of chrome/ also. BUG=447014 Review URL: https://codereview.chromium.org/840813005 Cr-Commit-Position: refs/heads/master@{#310537}
Diffstat (limited to 'extensions/shell/common')
-rw-r--r--extensions/shell/common/shell_extensions_client.cc5
-rw-r--r--extensions/shell/common/shell_extensions_client.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index d20a608cd..611ff99 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -222,9 +222,4 @@ bool ShellExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
return true;
}
-std::set<base::FilePath> ShellExtensionsClient::GetBrowserImagePaths(
- const Extension* extension) {
- return std::set<base::FilePath>();
-}
-
} // namespace extensions
diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h
index 3e5e9bb..0e8e519 100644
--- a/extensions/shell/common/shell_extensions_client.h
+++ b/extensions/shell/common/shell_extensions_client.h
@@ -47,8 +47,6 @@ class ShellExtensionsClient : public ExtensionsClient {
std::string GetWebstoreBaseURL() const override;
std::string GetWebstoreUpdateURL() const override;
bool IsBlacklistUpdateURL(const GURL& url) const override;
- std::set<base::FilePath> GetBrowserImagePaths(
- const Extension* extension) override;
private:
const ExtensionsAPIPermissions extensions_api_permissions_;