Enable permission warnings from ManifestHandlers.

chrome/common/extensions/permissions/permissions_data.cc

 // Copyright (c) 2013 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/permissions_data.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
-#include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/common/user_script.h"
 #include "url/gurl.h"
 
 namespace extensions {
@@ skipping 204 matching lines @@
 // Returns true if this extension id is from a trusted provider.
 bool IsTrustedId(const std::string& extension_id) {
   // See http://b/4946060 for more details.
   return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
 }
 
 }  // namespace
 
 struct PermissionsData::InitialPermissions {
   APIPermissionSet api_permissions;
+  ManifestPermissionSet manifest_permissions;
   URLPatternSet host_permissions;
   URLPatternSet scriptable_hosts;
 };
 
 PermissionsData::PermissionsData() {
 }
 
 PermissionsData::~PermissionsData() {
 }
 
@@ skipping 338 matching lines @@
                    keys::kOptionalPermissions,
                    &initial_optional_permissions_->api_permissions,
                    &initial_optional_permissions_->host_permissions,
                    error)) {
     return false;
   }
 
   return true;
 }
 
+void PermissionsData::InitializeManifestPermissions(Extension* extension) {
+  ManifestHandler::AddExtensionRequiredPermissions(
+    extension, &initial_required_permissions_->manifest_permissions);
+}
+
 void PermissionsData::FinalizePermissions(Extension* extension) {
   active_permissions_ = new PermissionSet(
       initial_required_permissions_->api_permissions,
+      initial_required_permissions_->manifest_permissions,
       initial_required_permissions_->host_permissions,
       initial_required_permissions_->scriptable_hosts);
 
   required_permission_set_ = new PermissionSet(
       initial_required_permissions_->api_permissions,
+      initial_required_permissions_->manifest_permissions,
       initial_required_permissions_->host_permissions,
       initial_required_permissions_->scriptable_hosts);
 
   optional_permission_set_ = new PermissionSet(
       initial_optional_permissions_->api_permissions,
+      initial_optional_permissions_->manifest_permissions,
       initial_optional_permissions_->host_permissions,
       URLPatternSet());
 
   initial_required_permissions_.reset();
   initial_optional_permissions_.reset();
 }
 
 }  // namespace extensions