| Index: chrome/browser/extensions/component_loader.h
|
| diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
|
| index 6961098a73174cb5ae09c17f04d470b4fc9df541..942a951874fe6e242c2c1d7d5912595ee67d674a 100644
|
| --- a/chrome/browser/extensions/component_loader.h
|
| +++ b/chrome/browser/extensions/component_loader.h
|
| @@ -9,6 +9,7 @@
|
| #include <string>
|
|
|
| #include "base/file_path.h"
|
| +#include "base/values.h"
|
|
|
| class Extension;
|
| class ExtensionService;
|
| @@ -28,7 +29,13 @@ class ComponentLoader {
|
| // initialized, the extension is loaded; otherwise, the load is deferred
|
| // until LoadAll is called.
|
| const Extension* Add(const std::string& manifest,
|
| - const FilePath& root_directory);
|
| + const FilePath& root_directory,
|
| + DictionaryValue* manifest_overrides);
|
| +
|
| + const Extension* Add(const std::string& manifest,
|
| + const FilePath& root_directory) {
|
| + return Add(manifest, root_directory, NULL);
|
| + }
|
|
|
| // Unloads a component extension and removes it from the list of component
|
| // extensions to be loaded.
|
| @@ -48,9 +55,11 @@ class ComponentLoader {
|
| // Information about a registered component extension.
|
| struct ComponentExtensionInfo {
|
| ComponentExtensionInfo(const std::string& manifest,
|
| - const FilePath& root_directory)
|
| + const FilePath& root_directory,
|
| + DictionaryValue* manifest_overrides)
|
| : manifest(manifest),
|
| - root_directory(root_directory) {
|
| + root_directory(root_directory),
|
| + manifest_overrides(manifest_overrides) {
|
| }
|
|
|
| bool Equals(const ComponentExtensionInfo& other) const;
|
| @@ -61,6 +70,10 @@ class ComponentLoader {
|
|
|
| // Directory where the extension is stored.
|
| FilePath root_directory;
|
| +
|
| + // If non-NULL, contains values that should be used to override the values
|
| + // specified in the manifest.
|
| + DictionaryValue* manifest_overrides;
|
| };
|
|
|
| // Loads a registered component extension.
|
|
|