chrome/common/extensions/unpacker.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« chrome/common/extensions/manifest.cc ('K') | « chrome/common/extensions/unpacker.h ('k') | chrome/common/extensions/unpacker_unittest.cc » ('j') | extensions/common/install_warning.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/unpacker.cc

diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc

index 08eb09b904a28baab3a40f18f7df6a54bb6d0156..f4715b9fdc25772164d6604928517281a2d9da2c 100644

--- a/chrome/common/extensions/unpacker.cc

+++ b/chrome/common/extensions/unpacker.cc

@@ -19,6 +19,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"

@@ -83,7 +84,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),

@@ -184,7 +185,7 @@ bool Unpacker::Run() {

return false;

}

- Extension::InstallWarningVector warnings;

+ InstallWarning::Vector warnings;

if (!extension_file_util::ValidateExtension(extension.get(),

&error, &warnings)) {

SetError(error);

« chrome/common/extensions/manifest.cc ('K') | « chrome/common/extensions/unpacker.h ('k') | chrome/common/extensions/unpacker_unittest.cc » ('j') | extensions/common/install_warning.h » ('J')