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

Unified Diff: chrome/browser/extensions/sandboxed_unpacker.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/browser/extensions/sandboxed_unpacker.h
diff --git a/chrome/browser/extensions/sandboxed_unpacker.h b/chrome/browser/extensions/sandboxed_unpacker.h
index bb3d4f37f209672a3d2c991650b03a424938817e..302997c1f2b350baf7f88f7e0a5b2c49aaf62b70 100644
--- a/chrome/browser/extensions/sandboxed_unpacker.h
+++ b/chrome/browser/extensions/sandboxed_unpacker.h
@@ -10,7 +10,8 @@
#include "base/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
-#include "chrome/common/extensions/extension.h"
+#include "base/time.h"
+#include "chrome/common/extensions/manifest.h"
#include "content/public/browser/utility_process_host_client.h"
namespace base {
@@ -19,6 +20,7 @@ class SequencedTaskRunner;
}
namespace extensions {
+class Extension;
class SandboxedUnpackerClient
: public base::RefCountedThreadSafe<SandboxedUnpackerClient> {
@@ -73,7 +75,7 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient {
// is done in a sandboxed subprocess. Otherwise, it is done in-process.
SandboxedUnpacker(const FilePath& crx_path,
bool run_out_of_process,
- Extension::Location location,
+ Manifest::Location location,
int creation_flags,
const FilePath& extensions_dir,
base::SequencedTaskRunner* unpacker_io_task_runner,
@@ -225,7 +227,7 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient {
base::TimeTicks unpack_start_time_;
// Location to use for the unpacked extension.
- Extension::Location location_;
+ Manifest::Location location_;
// Creation flags to use for the extension. These flags will be used
// when calling Extenion::Create() by the crx installer.
« no previous file with comments | « chrome/browser/extensions/requirements_checker_browsertest.cc ('k') | chrome/browser/extensions/sandboxed_unpacker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698