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

chrome/browser/extensions/pending_extension_manager.cc

 // 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.
 
 #include "chrome/browser/extensions/pending_extension_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/version.h"
@@ skipping 95 matching lines @@
 
   // Make sure we don't ever try to install the CWS app, because even though
   // it is listed as a syncable app (because its values need to be synced) it
   // should already be installed on every instance.
   if (id == extension_misc::kWebStoreAppId) {
     NOTREACHED();
     return false;
   }
 
   const bool kIsFromSync = true;
-  const Extension::Location kSyncLocation = Extension::INTERNAL;
+  const Manifest::Location kSyncLocation = Manifest::INTERNAL;
 
   return AddExtensionImpl(id, update_url, Version(), should_allow_install,
                           kIsFromSync, install_silently, kSyncLocation);
 }
 
 bool PendingExtensionManager::AddFromExternalUpdateUrl(
     const std::string& id,
     const GURL& update_url,
-    Extension::Location location) {
+    Manifest::Location location) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const bool kIsFromSync = false;
   const bool kInstallSilently = true;
 
   const Extension* extension = service_.GetInstalledExtension(id);
   if (extension &&
-      location == Extension::GetHigherPriorityLocation(location,
+      location == Manifest::GetHigherPriorityLocation(location,
                                                        extension->location())) {
     // If the new location has higher priority than the location of an existing
     // extension, let the update process overwrite the existing extension.
   } else {
     if (service_.IsExternalExtensionUninstalled(id))
       return false;
 
     if (extension) {
       LOG(DFATAL) << "Trying to add extension " << id
                   << " by external update, but it is already installed.";
       return false;
     }
   }
 
   return AddExtensionImpl(id, update_url, Version(), &AlwaysInstall,
                           kIsFromSync, kInstallSilently,
                           location);
 }
 
 
 bool PendingExtensionManager::AddFromExternalFile(
     const std::string& id,
-    Extension::Location install_source,
+    Manifest::Location install_source,
     const Version& version) {
   // TODO(skerner): AddFromSync() checks to see if the extension is
   // installed, but this method assumes that the caller already
   // made sure it is not installed.  Make all AddFrom*() methods
   // consistent.
   GURL kUpdateUrl = GURL();
   bool kIsFromSync = false;
   bool kInstallSilently = true;
 
   return AddExtensionImpl(
       id,
       kUpdateUrl,
       version,
       &AlwaysInstall,
       kIsFromSync,
       kInstallSilently,
       install_source);
 }
 
 void PendingExtensionManager::GetPendingIdsForUpdateCheck(
     std::list<std::string>* out_ids_for_update_check) const {
   PendingExtensionList::const_iterator iter;
   for (iter = pending_extension_list_.begin();
        iter != pending_extension_list_.end();
        ++iter) {
-    Extension::Location install_source = iter->install_source();
+    Manifest::Location install_source = iter->install_source();
 
     // Some install sources read a CRX from the filesystem.  They can
     // not be fetched from an update URL, so don't include them in the
     // set of ids.
-    if (install_source == Extension::EXTERNAL_PREF ||
-        install_source == Extension::EXTERNAL_REGISTRY)
+    if (install_source == Manifest::EXTERNAL_PREF ||
+        install_source == Manifest::EXTERNAL_REGISTRY)
       continue;
 
     out_ids_for_update_check->push_back(iter->id());
   }
 }
 
 bool PendingExtensionManager::AddExtensionImpl(
     const std::string& id,
     const GURL& update_url,
     const Version& version,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
     bool is_from_sync,
     bool install_silently,
-    Extension::Location install_source) {
+    Manifest::Location install_source) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   PendingExtensionInfo info(id,
                             update_url,
                             version,
                             should_allow_install,
                             is_from_sync,
                             install_silently,
                             install_source);
 
@@ skipping 31 matching lines @@
 
   return true;
 }
 
 void PendingExtensionManager::AddForTesting(
     const PendingExtensionInfo& pending_extension_info) {
   pending_extension_list_.push_back(pending_extension_info);
 }
 
 }  // namespace extensions