| Index: chrome/common/extensions/extension_file_util.h
|
| diff --git a/chrome/common/extensions/extension_file_util.h b/chrome/common/extensions/extension_file_util.h
|
| index 1ad1120c6dd16da4811a12798d1eb1cf271d565f..96f38fb11699ec7e9fade285b9c4aa3a8b196fc0 100644
|
| --- a/chrome/common/extensions/extension_file_util.h
|
| +++ b/chrome/common/extensions/extension_file_util.h
|
| @@ -12,7 +12,6 @@
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_message_bundle.h"
|
|
|
| -class Extension;
|
| class ExtensionMessageBundle;
|
| class FilePath;
|
| class GURL;
|
| @@ -41,17 +40,19 @@ void UninstallExtension(const FilePath& extensions_dir,
|
|
|
| // Loads and validates an extension from the specified directory. Returns NULL
|
| // on failure, with a description of the error in |error|.
|
| -scoped_refptr<Extension> LoadExtension(const FilePath& extension_root,
|
| - Extension::Location location,
|
| - int flags,
|
| - std::string* error);
|
| +scoped_refptr<extensions::Extension> LoadExtension(
|
| + const FilePath& extension_root,
|
| + extensions::Extension::Location location,
|
| + int flags,
|
| + std::string* error);
|
|
|
| // The same as LoadExtension except use the provided |extension_id|.
|
| -scoped_refptr<Extension> LoadExtension(const FilePath& extension_root,
|
| - const std::string& extension_id,
|
| - Extension::Location location,
|
| - int flags,
|
| - std::string* error);
|
| +scoped_refptr<extensions::Extension> LoadExtension(
|
| + const FilePath& extension_root,
|
| + const std::string& extension_id,
|
| + extensions::Extension::Location location,
|
| + int flags,
|
| + std::string* error);
|
|
|
| // Loads an extension manifest from the specified directory. Returns NULL
|
| // on failure, with a description of the error in |error|.
|
| @@ -60,7 +61,8 @@ base::DictionaryValue* LoadManifest(const FilePath& extension_root,
|
|
|
| // Returns true if the given extension object is valid and consistent.
|
| // Otherwise, a description of the error is returned in |error|.
|
| -bool ValidateExtension(const Extension* extension, std::string* error);
|
| +bool ValidateExtension(const extensions::Extension* extension,
|
| + std::string* error);
|
|
|
| // Cleans up the extension install directory. It can end up with garbage in it
|
| // if extensions can't initially be removed when they are uninstalled (eg if a
|
|
|