Chromium Code Reviews| 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 "chrome/common/extensions/extension.h" | 5 #include "chrome/common/extensions/extension.h" |
| 6 | 6 |
| 7 #include "base/base64.h" | 7 #include "base/base64.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1427 | 1427 |
| 1428 // TODO(jeremya/kalman) do this via the features system by exposing the | 1428 // TODO(jeremya/kalman) do this via the features system by exposing the |
| 1429 // app.window API to platform apps, with no dependency on any permissions. | 1429 // app.window API to platform apps, with no dependency on any permissions. |
| 1430 // See http://crbug.com/120069. | 1430 // See http://crbug.com/120069. |
| 1431 if (is_platform_app()) { | 1431 if (is_platform_app()) { |
| 1432 api_permissions.insert(APIPermission::kAppCurrentWindowInternal); | 1432 api_permissions.insert(APIPermission::kAppCurrentWindowInternal); |
| 1433 api_permissions.insert(APIPermission::kAppRuntime); | 1433 api_permissions.insert(APIPermission::kAppRuntime); |
| 1434 api_permissions.insert(APIPermission::kAppWindow); | 1434 api_permissions.insert(APIPermission::kAppWindow); |
| 1435 } | 1435 } |
| 1436 | 1436 |
| 1437 if (manifest_->HasKey("devtools_page")) | |
| 1438 api_permissions.insert(APIPermission::kDevtools); | |
|
not at google - send to devlin
2013/02/15 22:26:17
Yeah never mind, we can revert this.
cduvall
2013/02/19 23:58:49
Done.
| |
| 1439 | |
| 1437 APIPermissionSet optional_api_permissions; | 1440 APIPermissionSet optional_api_permissions; |
| 1438 URLPatternSet optional_host_permissions; | 1441 URLPatternSet optional_host_permissions; |
| 1439 if (!ParsePermissions(keys::kOptionalPermissions, | 1442 if (!ParsePermissions(keys::kOptionalPermissions, |
| 1440 error, | 1443 error, |
| 1441 &optional_api_permissions, | 1444 &optional_api_permissions, |
| 1442 &optional_host_permissions)) { | 1445 &optional_host_permissions)) { |
| 1443 return false; | 1446 return false; |
| 1444 } | 1447 } |
| 1445 | 1448 |
| 1446 if (ContainsManifestForbiddenPermission(api_permissions, error) || | 1449 if (ContainsManifestForbiddenPermission(api_permissions, error) || |
| (...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2794 | 2797 |
| 2795 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( | 2798 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( |
| 2796 const Extension* extension, | 2799 const Extension* extension, |
| 2797 const PermissionSet* permissions, | 2800 const PermissionSet* permissions, |
| 2798 Reason reason) | 2801 Reason reason) |
| 2799 : reason(reason), | 2802 : reason(reason), |
| 2800 extension(extension), | 2803 extension(extension), |
| 2801 permissions(permissions) {} | 2804 permissions(permissions) {} |
| 2802 | 2805 |
| 2803 } // namespace extensions | 2806 } // namespace extensions |
| OLD | NEW |