diff options
| author | Charlie Kehoe <ckehoe@chromium.org> | 2015-06-10 15:21:38 -0700 |
|---|---|---|
| committer | Charlie Kehoe <ckehoe@chromium.org> | 2015-06-10 22:22:56 +0000 |
| commit | 65380f6680684c1265321ac696142c4c1d351389 (patch) | |
| tree | eee0210a344d3ff207fbe406aca055bcd28baa67 | |
| parent | 51ab8218de0844bfc2b4feff5c33f2fe48e894d4 (diff) | |
| download | chromium_src-65380f6680684c1265321ac696142c4c1d351389.zip chromium_src-65380f6680684c1265321ac696142c4c1d351389.tar.gz chromium_src-65380f6680684c1265321ac696142c4c1d351389.tar.bz2 | |
Whitelisting Whispernet-enabled extensions for audio input (M44 merge)
BUG=496938
TBR=pennymac@chromium.org
Review URL: https://codereview.chromium.org/1169793002
Cr-Commit-Position: refs/heads/master@{#333375}
(cherry picked from commit 8ba9a71daf0463f19e16267aa7744d4c0c2392e7)
Review URL: https://codereview.chromium.org/1176993003
Cr-Commit-Position: refs/branch-heads/2403@{#270}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
| -rw-r--r-- | extensions/common/api/_permission_features.json | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json index 2897a81..7b392d5 100644 --- a/extensions/common/api/_permission_features.json +++ b/extensions/common/api/_permission_features.json @@ -125,10 +125,18 @@ // http://crbug.com/292856 "3F50C3A83839D9C76334BCE81CDEC06174F266AF", "39BE69F11F68E4EED080DA3DC2394F7885B7AFF9", - "FF78670081967CE21DB86A04AD94A0498F01E20A", + "FF78670081967CE21DB86A04AD94A0498F01E20A", // http://crbug.com/409192 // Hotword component extension - "62CCAAD339E6451BBF97C4BBDF758E934A05AD0B" - ] + "62CCAAD339E6451BBF97C4BBDF758E934A05AD0B", + "0C0426C12F94156F330FFAF346A976BA8878DE78", // http://crbug.com/496954 + "AC4538682FCECD28587C7A0F80849F78F4872BC2", // http://crbug.com/496954 + "CCA4D85A67ADD65DA6C02E49EE3C080C54A8211C", // http://crbug.com/496954 + "05EBA3051DFCA6AF17070AEE5FE8C66322FF4738", // http://crbug.com/431978 + "11B478CEC461C766A2DC1E5BEEB7970AE06DC9C2", // http://crbug.com/458218 + "0EFB879311E9EFBB7C45251F89EC655711B1F6ED", // http://crbug.com/458218 + "9193D3A51E2FE33B496CDA53EA330423166E7F02", // http://crbug.com/458218 + "F9119B8B18C7C82B51E7BC6FF816B694F2EC3E89" // http://crbug.com/458218 + ] } ], "bluetoothPrivate": { |