Extension install prompt: in the delegated permissions prompt, include optional permissions

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 18 matching lines @@
 #include "extensions/browser/image_loader.h"
 #include "extensions/browser/install/extension_install_ui.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
+#include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/url_pattern.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 868 matching lines @@
   if (custom_permissions_.get()) {
     permissions_to_display = custom_permissions_;
   } else if (extension_) {
     // Initialize permissions if they have not already been set so that
     // withheld permissions are displayed properly in the install prompt.
     extensions::PermissionsUpdater(
         profile_, extensions::PermissionsUpdater::INIT_FLAG_TRANSIENT)
         .InitializePermissions(extension_);
     permissions_to_display =
         extension_->permissions_data()->active_permissions();
+    if (prompt_->type() == DELEGATED_PERMISSIONS_PROMPT) {

[not at google - send to devlin, 2015/03/02 17:52:00]

Why?

[Marc Treib, 2015/03/02 18:15:41]

In delegated installs, the custodian "pre-approves" all optional permissions
(the supervised user can then enable them themselves). I've added a comment to
explain.

+      scoped_refptr<const PermissionSet> optional_permissions =
+          extensions::PermissionsParser::GetOptionalPermissions(extension_);
+      permissions_to_display = PermissionSet::CreateUnion(
+          permissions_to_display.get(),
+          optional_permissions.get());
+    }
   }
 
   if (permissions_to_display.get() &&
       (!extension_ ||
        !extensions::PermissionsData::ShouldSkipPermissionWarnings(
            extension_->id()))) {
     Manifest::Type type =
         extension_ ? extension_->GetType() : Manifest::TYPE_UNKNOWN;
     const extensions::PermissionMessageProvider* message_provider =
         extensions::PermissionMessageProvider::Get();
@@ skipping 49 matching lines @@
   if (show_params_->WasParentDestroyed()) {
     delegate_->InstallUIAbort(false);
     return;
   }
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_.get(), delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_.get(), delegate_, prompt_);
 }