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

chrome/browser/extensions/crx_installer.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_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/crx_installer_error.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/web_apps.h"
 #include "sync/api/string_ordinal.h"
 
 class ExtensionService;
 class ExtensionServiceTest;
 class SkBitmap;
 
 namespace base {
 class SequencedTaskRunner;
 }
@@ skipping 72 matching lines @@
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
   int creation_flags() const { return creation_flags_; }
   void set_creation_flags(int val) { creation_flags_ = val; }
 
   const GURL& download_url() const { return download_url_; }
   void set_download_url(const GURL& val) { download_url_ = val; }
 
   const FilePath& source_file() const { return source_file_; }
 
-  Extension::Location install_source() const {
+  Manifest::Location install_source() const {
     return install_source_;
   }
-  void set_install_source(Extension::Location source) {
+  void set_install_source(Manifest::Location source) {
     install_source_ = source;
   }
 
   const std::string& expected_id() const { return expected_id_; }
   void set_expected_id(const std::string& val) { expected_id_ = val; }
 
   void set_expected_version(const Version& val) {
     expected_version_.reset(new Version(val));
   }
 
@@ skipping 126 matching lines @@
 
   // The URL the file was downloaded from.
   GURL download_url_;
 
   // The directory extensions are installed to.
   FilePath install_directory_;
 
   // The location the installation came from (bundled with Chromium, registry,
   // manual install, etc). This metadata is saved with the installation if
   // successful. Defaults to INTERNAL.
-  Extension::Location install_source_;
+  Manifest::Location install_source_;
 
   // Indicates whether the user has already approved the extension to be
   // installed. If true, |expected_manifest_| and |expected_id_| must match
   // those of the CRX.
   bool approved_;
 
   // For updates, external and webstore installs we have an ID we're expecting
   // the extension to contain.
   std::string expected_id_;
 
@@ skipping 115 matching lines @@
 
   // Used to show the install dialog.
   ExtensionInstallPrompt::ShowDialogCallback show_dialog_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_