summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_dom_ui.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/browser/extensions/extension_dom_ui.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/browser/extensions/extension_dom_ui.h')
-rw-r--r--chrome/browser/extensions/extension_dom_ui.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_dom_ui.h b/chrome/browser/extensions/extension_dom_ui.h
index a729167..20549ac 100644
--- a/chrome/browser/extensions/extension_dom_ui.h
+++ b/chrome/browser/extensions/extension_dom_ui.h
@@ -8,6 +8,7 @@
#include "base/scoped_ptr.h"
#include "chrome/browser/dom_ui/dom_ui.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
+#include "chrome/common/extensions/extension.h"
class ListValue;
class PrefService;
@@ -15,7 +16,7 @@ class TabContents;
// This class implements DOMUI for extensions and allows extensions to put UI in
// the main tab contents area.
-class ExtensionDOMUI
+class ExtensionDOMUI
: public DOMUI,
public ExtensionFunctionDispatcher::Delegate {
public:
@@ -43,9 +44,9 @@ class ExtensionDOMUI
// Page names are the keys, and chrome-extension: URLs are the values.
// (e.g. { "newtab": "chrome-extension://<id>/my_new_tab.html" }
static void RegisterChromeURLOverrides(Profile* profile,
- const DictionaryValue* overrides);
+ const Extension::URLOverrideMap& overrides);
static void UnregisterChromeURLOverrides(Profile* profile,
- const DictionaryValue* overrides);
+ const Extension::URLOverrideMap& overrides);
static void UnregisterChromeURLOverride(const std::string& page,
Profile* profile,
Value* override);