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

Unified Diff: chrome/common/extensions/unpacker.cc

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
« no previous file with comments | « chrome/common/extensions/unpacker.h ('k') | chrome/common/extensions/unpacker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/unpacker.cc
diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc
index 90ce3fd5a4877fc1869b0f56949a181ce140d43f..41bf772d985e186b737688a776deaa19775632fe 100644
--- a/chrome/common/extensions/unpacker.cc
+++ b/chrome/common/extensions/unpacker.cc
@@ -20,6 +20,7 @@
#include "chrome/common/extensions/extension_file_util.h"
#include "chrome/common/extensions/extension_l10n_util.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
#include "chrome/common/url_constants.h"
#include "chrome/common/zip.h"
#include "content/public/common/common_param_traits.h"
@@ -84,7 +85,7 @@ namespace extensions {
Unpacker::Unpacker(const FilePath& extension_path,
const std::string& extension_id,
- Extension::Location location,
+ Manifest::Location location,
int creation_flags)
: extension_path_(extension_path),
extension_id_(extension_id),
@@ -185,7 +186,7 @@ bool Unpacker::Run() {
return false;
}
- Extension::InstallWarningVector warnings;
+ std::vector<InstallWarning> warnings;
if (!extension_file_util::ValidateExtension(extension.get(),
&error, &warnings)) {
SetError(error);
« no previous file with comments | « chrome/common/extensions/unpacker.h ('k') | chrome/common/extensions/unpacker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698