Enable permission warnings from ManifestHandlers.

chrome/browser/extensions/extension_install_prompt.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/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 767 matching lines @@
 void ExtensionInstallPrompt::OnMintTokenFailure(
     const GoogleServiceAuthError& error) {
   ShowConfirmation();
 }
 
 void ExtensionInstallPrompt::ShowConfirmation() {
   if (permissions_.get() &&
       (!extension_ ||
        !extensions::PermissionsData::ShouldSkipPermissionWarnings(
            extension_))) {
-    Manifest::Type extension_type = extension_ ?
-        extension_->GetType() : Manifest::TYPE_UNKNOWN;
-    prompt_.SetPermissions(
+    DCHECK(extension_);
+
+    std::vector<string16> all_messages;
+    std::vector<string16> all_messages_details;
+
+    // Messages from PermissionMessageProvider
+    Manifest::Type extension_type = extension_->GetType();
+    std::vector<string16> permission_messages =
         extensions::PermissionMessageProvider::Get()->
-            GetWarningMessages(permissions_, extension_type));
-    prompt_.SetPermissionsDetails(
+            GetWarningMessages(permissions_, extension_type);
+    std::vector<string16> permission_messages_details =
         extensions::PermissionMessageProvider::Get()->
-            GetWarningMessagesDetails(permissions_, extension_type));
+            GetWarningMessagesDetails(permissions_, extension_type);
+
+    all_messages.insert(all_messages.end(),
+                        permission_messages.begin(),
+                        permission_messages.end());
+    all_messages_details.insert(all_messages_details.end(),
+                                permission_messages_details.begin(),
+                                permission_messages_details.end());
+
+    // Messages from extension's ManifestHandlers
+    std::vector<string16> manifest_messages =
+        extensions::ManifestHandler::
+            GetExtensionPermissionWarningMessages(extension_);
+    std::vector<string16> manifest_messages_details =
+        extensions::ManifestHandler::
+            GetExtensionPermissionWarningMessagesDetails(extension_);
+
+    all_messages.insert(all_messages.end(),
+                        manifest_messages.begin(),
+                        manifest_messages.end());
+    all_messages_details.insert(all_messages_details.end(),
+                                manifest_messages_details.begin(),
+                                manifest_messages_details.end());
+
+    prompt_.SetPermissions(all_messages);
+    prompt_.SetPermissionsDetails(all_messages_details);
   }
 
   switch (prompt_.type()) {
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INLINE_INSTALL_PROMPT:
     case EXTERNAL_INSTALL_PROMPT:
     case INSTALL_PROMPT:
     case LAUNCH_PROMPT:
     case POST_INSTALL_PERMISSIONS_PROMPT: {
@@ skipping 11 matching lines @@
   }
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_, delegate_, prompt_);
 }