Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

chrome/common/extensions/unpacker.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_EXTENSIONS_UNPACKER_H_
 #define CHROME_COMMON_EXTENSIONS_UNPACKER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/tuple.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 
 class SkBitmap;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace extensions {
 
 // This class unpacks an extension.  It is designed to be used in a sandboxed
 // child process.  We unpack and parse various bits of the extension, then
 // report back to the browser process, who then transcodes the pre-parsed bits
 // and writes them back out to disk for later use.
 class Unpacker {
  public:
   typedef std::vector< Tuple2<SkBitmap, FilePath> > DecodedImages;
 
   Unpacker(const FilePath& extension_path,
            const std::string& extension_id,
-           Extension::Location location,
+           Manifest::Location location,
            int creation_flags);
   ~Unpacker();
 
   // Install the extension file at |extension_path|.  Returns true on success.
   // Otherwise, error_message will contain a string explaining what went wrong.
   bool Run();
 
   // Write the decoded images to kDecodedImagesFilename.  We do this instead
   // of sending them over IPC, since they are so large.  Returns true on
   // success.
@@ skipping 43 matching lines @@
   void SetError(const std::string& error);
   void SetUTF16Error(const string16& error);
 
   // The extension to unpack.
   FilePath extension_path_;
 
   // The extension ID if known.
   std::string extension_id_;
 
   // The location to use for the created extension.
-  Extension::Location location_;
+  Manifest::Location location_;
 
   // The creation flags to use with the created extension.
   int creation_flags_;
 
   // The place we unpacked the extension to.
   FilePath temp_install_dir_;
 
   // The parsed version of the manifest JSON contained in the extension.
   scoped_ptr<base::DictionaryValue> parsed_manifest_;
 
   // A list of decoded images and the paths where those images came from.  Paths
   // are relative to the manifest file.
   DecodedImages decoded_images_;
 
   // Dictionary of relative paths and catalogs per path. Paths are in the form
   // of _locales/locale, without messages.json base part.
   scoped_ptr<base::DictionaryValue> parsed_catalogs_;
 
   // The last error message that was set.  Empty if there were no errors.
   string16 error_message_;
 
   DISALLOW_COPY_AND_ASSIGN(Unpacker);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_UNPACKER_H_