| Index: chrome/common/extensions/permissions/permissions_data.cc
|
| diff --git a/chrome/common/extensions/permissions/permissions_data.cc b/chrome/common/extensions/permissions/permissions_data.cc
|
| index 9c0891a6b3ed97ccba97a896d2c8c8a37d8a1c7d..48687ffc837ba56af698b73982c0a3e8d6eefe6a 100644
|
| --- a/chrome/common/extensions/permissions/permissions_data.cc
|
| +++ b/chrome/common/extensions/permissions/permissions_data.cc
|
| @@ -246,6 +246,7 @@ bool IsTrustedId(const std::string& extension_id) {
|
|
|
| struct PermissionsData::InitialPermissions {
|
| APIPermissionSet api_permissions;
|
| + ManifestPermissionSet manifest_permissions;
|
| URLPatternSet host_permissions;
|
| URLPatternSet scriptable_hosts;
|
| };
|
| @@ -607,16 +608,19 @@ bool PermissionsData::ParsePermissions(Extension* extension, string16* error) {
|
| 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());
|
|
|
|
|