diff options
| author | hclam <hclam@chromium.org> | 2014-08-28 18:11:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 01:12:36 +0000 |
| commit | 7b723d5ca9bcd0b3e7619c08b4284e97ffc25d31 (patch) | |
| tree | 2242bf2975589d1fae36429b1f92bf29beb7a8ac | |
| parent | b3f24f368f19fe3a926365ba5076ba31d6ce0452 (diff) | |
| download | chromium_src-7b723d5ca9bcd0b3e7619c08b4284e97ffc25d31.zip chromium_src-7b723d5ca9bcd0b3e7619c08b4284e97ffc25d31.tar.gz chromium_src-7b723d5ca9bcd0b3e7619c08b4284e97ffc25d31.tar.bz2 | |
Revert of Fix the Copresence permission. (patchset #1 of https://codereview.chromium.org/523433002/)
Reason for revert:
This change causes a test failure:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/48008/steps/unit_tests/logs/stdio
Error:
[ RUN ] PermissionsTest.PermissionMessages
../../chrome/common/extensions/permissions/permission_set_unittest.cc:781: Failure
Value of: permission_info->message_id()
Actual: 65
Expected: PermissionMessage::kNone
Which is: 1
unexpected message_id for copresence
Looks like this change is the cause.
Original issue's description:
> Fix the Copresence permission.
>
> The initializer for the Copresence permission is malformed. It specifies the
> message id instead of the flag.
>
> R=kalman@chromium.org
> BUG=408843
>
> Committed to pending queue: https://chromium.googlesource.com/chromium/src/+/c2a41e8
TBR=kalman@chromium.org,rkc@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=408843
Review URL: https://codereview.chromium.org/520493002
Cr-Commit-Position: refs/heads/master@{#292532}
| -rw-r--r-- | chrome/common/extensions/permissions/chrome_api_permissions.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index 04e5c41..9baa41b 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc @@ -109,7 +109,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions() PermissionMessage::kContentSettings}, {APIPermission::kContextMenus, "contextMenus"}, {APIPermission::kCookie, "cookies"}, - {APIPermission::kCopresence, "copresence", APIPermissionInfo::kFlagNone, + {APIPermission::kCopresence, "copresence", IDS_EXTENSION_PROMPT_WARNING_COPRESENCE, PermissionMessage::kCopresence}, {APIPermission::kCopresencePrivate, "copresencePrivate"}, {APIPermission::kEnterprisePlatformKeys, "enterprise.platformKeys"}, |