diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 20:29:35 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 20:29:35 +0000 |
| commit | 594cfb6d1d4c93c1fea71c31ebe8269b40f9a8a2 (patch) | |
| tree | eb1488a12fb149aaac03853df2e8e8014dd10001 | |
| parent | dad8997535bc7bb63d93c6b325cba646a5126015 (diff) | |
| download | chromium_src-594cfb6d1d4c93c1fea71c31ebe8269b40f9a8a2.zip chromium_src-594cfb6d1d4c93c1fea71c31ebe8269b40f9a8a2.tar.gz chromium_src-594cfb6d1d4c93c1fea71c31ebe8269b40f9a8a2.tar.bz2 | |
Merge 221147 "Whitelist some Google apps for oauth2.auto_approve"
> Whitelist some Google apps for oauth2.auto_approve
>
> BUG=281587
>
> Review URL: https://chromiumcodereview.appspot.com/23499005
TBR=rockot@chromium.org
Review URL: https://codereview.chromium.org/23468017
git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@222327 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/api/_manifest_features.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json index 0b75869..0b9097c 100644 --- a/chrome/common/extensions/api/_manifest_features.json +++ b/chrome/common/extensions/api/_manifest_features.json @@ -256,7 +256,9 @@ "hkhhlkdconhgemhegnplaldnmnmkaemd", // Get Started App "nmmhkkegccagdldgiimedpiccmgmieda", // In-app payments support app. "4B1D0E19C6C43C008C44A8278C8B5BFE15ABEB3C", - "F7FA7ABC1ECB89BA8EE6656847EFABBF43BB9BCA" + "F7FA7ABC1ECB89BA8EE6656847EFABBF43BB9BCA", + "1A26E32DE447A17CBE5E9750CDBA78F58539B39C", // TODO(rockot): Kill these. + "E61F841D8210B6A9891E5384CB665FBED31FCD7B" // See http://crbug.com/281715 ] }, "offline_enabled": { |