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

chrome/common/extensions/permissions/permission_set.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/common/extensions/permissions/permission_set.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 
@@ skipping 249 matching lines @@
 
   return false;
 }
 
 std::set<std::string>
     PermissionSet::GetDistinctHostsForDisplay() const {
   return GetDistinctHosts(effective_hosts_, true, true);
 }
 
 PermissionMessages PermissionSet::GetPermissionMessages(
-    Extension::Type extension_type) const {
+    Manifest::Type extension_type) const {
   PermissionMessages messages;
 
   if (HasEffectiveFullAccess()) {
     messages.push_back(PermissionMessage(
         PermissionMessage::kFullAccess,
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS)));
     return messages;
   }
 
   // Since platform apps always use isolated storage, they can't (silently)
   // access user data on other domains, so there's no need to prompt.
-  if (extension_type != Extension::TYPE_PLATFORM_APP) {
+  if (extension_type != Manifest::TYPE_PLATFORM_APP) {
     if (HasEffectiveAccessToAllHosts()) {
       messages.push_back(PermissionMessage(
           PermissionMessage::kHostsAll,
           l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS)));
     } else {
       std::set<std::string> hosts = GetDistinctHostsForDisplay();
       if (!hosts.empty())
         messages.push_back(PermissionMessage::CreateFromHostList(hosts));
     }
   }
 
   std::set<PermissionMessage> simple_msgs =
       GetSimplePermissionMessages();
   messages.insert(messages.end(), simple_msgs.begin(), simple_msgs.end());
 
   return messages;
 }
 
 std::vector<string16> PermissionSet::GetWarningMessages(
-    Extension::Type extension_type) const {
+    Manifest::Type extension_type) const {
   std::vector<string16> messages;
   PermissionMessages permissions = GetPermissionMessages(extension_type);
 
   bool audio_capture = false;
   bool video_capture = false;
   for (PermissionMessages::const_iterator i = permissions.begin();
        i != permissions.end(); ++i) {
     if (i->id() == PermissionMessage::kAudioCapture)
       audio_capture = true;
     if (i->id() == PermissionMessage::kVideoCapture)
@@ skipping 293 matching lines @@
   std::set<std::string> new_hosts_only;
 
   std::set_difference(new_hosts_set.begin(), new_hosts_set.end(),
                       old_hosts_set.begin(), old_hosts_set.end(),
                       std::inserter(new_hosts_only, new_hosts_only.begin()));
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions