summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension.h
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-17 13:54:57 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-17 13:54:57 +0000
commitd3cfa48d080a3265f7c300941188b0c712383de4 (patch)
tree20e896cba61714ea075e7c81b20ef7ed8cc01439 /chrome/common/extensions/extension.h
parent7cb75fd2e3e185ec0a3622ca66e98a3e99be4165 (diff)
downloadchromium_src-d3cfa48d080a3265f7c300941188b0c712383de4.zip
chromium_src-d3cfa48d080a3265f7c300941188b0c712383de4.tar.gz
chromium_src-d3cfa48d080a3265f7c300941188b0c712383de4.tar.bz2
Fix chrome_url_overides to work with packed extensions.
The InitFromValue code was modifying the JSON with some local data which was then being re-used by the unpacker and sent up to the browser which caused it to use this temporary local data as if it was the original manifest source. BUG=24398 TEST=pack and install override_igoogle extension Review URL: http://codereview.chromium.org/276074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension.h')
-rw-r--r--chrome/common/extensions/extension.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index f506ffd..eac617f 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -26,6 +26,7 @@
class Extension {
public:
typedef std::vector<URLPattern> HostPermissions;
+ typedef std::map<const std::string, GURL> URLOverrideMap;
// What an extension was loaded from.
enum Location {
@@ -259,8 +260,8 @@ class Extension {
}
// Chrome URL overrides (see ExtensionOverrideUI).
- DictionaryValue* GetChromeURLOverrides() const {
- return chrome_url_overrides_.get();
+ const URLOverrideMap& GetChromeURLOverrides() const {
+ return chrome_url_overrides_;
}
// Runtime data:
@@ -384,7 +385,7 @@ class Extension {
// A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
// which override the handling of those URLs.
- scoped_ptr<DictionaryValue> chrome_url_overrides_;
+ URLOverrideMap chrome_url_overrides_;
// Runtime data: