| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/common/permissions/permissions_data.h" | 5 #include "extensions/common/permissions/permissions_data.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 // unrecognized permissions. This may happen legitimately if the | 145 // unrecognized permissions. This may happen legitimately if the |
| 146 // extensions requests platform- or channel-specific permissions. | 146 // extensions requests platform- or channel-specific permissions. |
| 147 extension->AddInstallWarning(InstallWarning(availability.message(), | 147 extension->AddInstallWarning(InstallWarning(availability.message(), |
| 148 feature->name())); | 148 feature->name())); |
| 149 to_remove.push_back(iter->id()); | 149 to_remove.push_back(iter->id()); |
| 150 continue; | 150 continue; |
| 151 } | 151 } |
| 152 | 152 |
| 153 if (iter->id() == APIPermission::kExperimental) { | 153 if (iter->id() == APIPermission::kExperimental) { |
| 154 if (!CanSpecifyExperimentalPermission(extension)) { | 154 if (!CanSpecifyExperimentalPermission(extension)) { |
| 155 *error = ASCIIToUTF16(errors::kExperimentalFlagRequired); | 155 *error = base::ASCIIToUTF16(errors::kExperimentalFlagRequired); |
| 156 return false; | 156 return false; |
| 157 } | 157 } |
| 158 } | 158 } |
| 159 } | 159 } |
| 160 | 160 |
| 161 api_permissions->AddImpliedPermissions(); | 161 api_permissions->AddImpliedPermissions(); |
| 162 | 162 |
| 163 // Remove permissions that are not available to this extension. | 163 // Remove permissions that are not available to this extension. |
| 164 for (std::vector<APIPermission::ID>::const_iterator iter = to_remove.begin(); | 164 for (std::vector<APIPermission::ID>::const_iterator iter = to_remove.begin(); |
| 165 iter != to_remove.end(); ++iter) { | 165 iter != to_remove.end(); ++iter) { |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 initial_optional_permissions_->api_permissions, | 618 initial_optional_permissions_->api_permissions, |
| 619 initial_optional_permissions_->manifest_permissions, | 619 initial_optional_permissions_->manifest_permissions, |
| 620 initial_optional_permissions_->host_permissions, | 620 initial_optional_permissions_->host_permissions, |
| 621 URLPatternSet()); | 621 URLPatternSet()); |
| 622 | 622 |
| 623 initial_required_permissions_.reset(); | 623 initial_required_permissions_.reset(); |
| 624 initial_optional_permissions_.reset(); | 624 initial_optional_permissions_.reset(); |
| 625 } | 625 } |
| 626 | 626 |
| 627 } // namespace extensions | 627 } // namespace extensions |
| OLD | NEW |