summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/sandboxed_unpacker.h
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 08:41:40 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-31 08:41:40 +0000
commit1d5e58b96403aab76b4ae9f957eac7fac9c54182 (patch)
tree531272d9e76d671eee55318d5cd75da120e8a277 /chrome/browser/extensions/sandboxed_unpacker.h
parent13fb3ec6e5f257683426c353f70523b1ad2e24f7 (diff)
downloadchromium_src-1d5e58b96403aab76b4ae9f957eac7fac9c54182.zip
chromium_src-1d5e58b96403aab76b4ae9f957eac7fac9c54182.tar.gz
chromium_src-1d5e58b96403aab76b4ae9f957eac7fac9c54182.tar.bz2
Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.
Reverses the dependency between Extension and Manifest. Part 1 of moving Manifest to top-level extensions. BUG=162530 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/12093036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/sandboxed_unpacker.h')
-rw-r--r--chrome/browser/extensions/sandboxed_unpacker.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/extensions/sandboxed_unpacker.h b/chrome/browser/extensions/sandboxed_unpacker.h
index bb3d4f3..302997c 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.