| Index: chrome/common/extensions/extension_builder.h
|
| diff --git a/chrome/common/extensions/extension_builder.h b/chrome/common/extensions/extension_builder.h
|
| index 209b70494e9ce5bbc8dc45b6b3bcab71cabaf6d9..558daef64dd50d8f45aea48a8a29d996eda88d56 100644
|
| --- a/chrome/common/extensions/extension_builder.h
|
| +++ b/chrome/common/extensions/extension_builder.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/common/extensions/extension.h"
|
| +#include "chrome/common/extensions/manifest.h"
|
| #include "chrome/common/extensions/value_builder.h"
|
|
|
| namespace extensions {
|
| @@ -27,8 +28,8 @@ class ExtensionBuilder {
|
| // Defaults to FilePath().
|
| ExtensionBuilder& SetPath(const FilePath& path);
|
|
|
| - // Defaults to Extension::LOAD.
|
| - ExtensionBuilder& SetLocation(Extension::Location location);
|
| + // Defaults to Manifest::LOAD.
|
| + ExtensionBuilder& SetLocation(Manifest::Location location);
|
|
|
| ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest);
|
| ExtensionBuilder& SetManifest(DictionaryBuilder& manifest_builder) {
|
| @@ -42,7 +43,7 @@ class ExtensionBuilder {
|
|
|
| private:
|
| FilePath path_;
|
| - Extension::Location location_;
|
| + Manifest::Location location_;
|
| scoped_ptr<base::DictionaryValue> manifest_;
|
| int flags_;
|
| std::string id_;
|
|
|