Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6074)

Unified Diff: chrome/common/extensions/extension_file_util.h

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 fd1354d4c1829831a9457b2347db637a3147086f..d81e2d850153518a499f77a8ae2d973d1eba64da 100644
--- a/chrome/common/extensions/extension_file_util.h
+++ b/chrome/common/extensions/extension_file_util.h
@@ -8,8 +8,10 @@
#include <string>
#include <map>
-#include "chrome/common/extensions/extension.h"
+#include "base/memory/ref_counted.h"
+#include "chrome/common/extensions/manifest.h"
#include "chrome/common/extensions/message_bundle.h"
+#include "extensions/common/install_warning.h"
class FilePath;
class GURL;
@@ -19,6 +21,7 @@ class DictionaryValue;
}
namespace extensions {
+class Extension;
class MessageBundle;
}
@@ -41,7 +44,7 @@ void UninstallExtension(const FilePath& extensions_dir,
// on failure, with a description of the error in |error|.
scoped_refptr<extensions::Extension> LoadExtension(
const FilePath& extension_root,
- extensions::Extension::Location location,
+ extensions::Manifest::Location location,
int flags,
std::string* error);
@@ -49,7 +52,7 @@ scoped_refptr<extensions::Extension> LoadExtension(
scoped_refptr<extensions::Extension> LoadExtension(
const FilePath& extension_root,
const std::string& extension_id,
- extensions::Extension::Location location,
+ extensions::Manifest::Location location,
int flags,
std::string* error);
@@ -69,7 +72,7 @@ bool ValidateFilePath(const FilePath& path);
// returned in |error|.
bool ValidateExtension(const extensions::Extension* extension,
std::string* error,
- extensions::Extension::InstallWarningVector* warnings);
+ extensions::InstallWarning::Vector* warnings);
// Returns a list of files that contain private keys inside |extension_dir|.
std::vector<FilePath> FindPrivateKeyFiles(const FilePath& extension_dir);

Powered by Google App Engine
This is Rietveld 408576698