summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarnarb <arnarb@chromium.org>2015-01-07 21:17:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-08 05:18:20 +0000
commit408d0b51b93df4a172b131225fc28748a66ec241 (patch)
treea33b3f2267ee19a478830e8311bcbcffaca9dbf0
parentb324bc63600f0bf8748569ce84638c080dac36aa (diff)
downloadchromium_src-408d0b51b93df4a172b131225fc28748a66ec241.zip
chromium_src-408d0b51b93df4a172b131225fc28748a66ec241.tar.gz
chromium_src-408d0b51b93df4a172b131225fc28748a66ec241.tar.bz2
Revert of Partial revert of "Enable 3rd party support for Security Keys." (patchset #1 id:1 of https://codereview.chromium.org/814103003/)
Reason for revert: Re-reverting, as original bug (crbug.com/443400) has been identifed as a bug in Hangouts, and this is a blocker for M41 beta release. Original issue's description: > Partial revert of "Enable 3rd party support for Security Keys." > > Enabling access to Security Keys from all urls broke the Hangout Services > component extension, so this CL limits externally_connectable to the > original whitelist. > > BUG=443400,426358 > > Committed: https://crrev.com/18c0f3662d7716a045a601fcc0c8bd856fe1f5db > Cr-Commit-Position: refs/heads/master@{#309237} TBR=xiyuan@chromium.org,juanlang@chromium.org,kalman@chromium.org,vrk@chromium.org NOTREECHECKS=true NOTRY=true BUG=443400,426358 Review URL: https://codereview.chromium.org/825273003 Cr-Commit-Position: refs/heads/master@{#310453}
-rw-r--r--chrome/browser/resources/cryptotoken/manifest.json5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/resources/cryptotoken/manifest.json b/chrome/browser/resources/cryptotoken/manifest.json
index 3353919..bfa79d5 100644
--- a/chrome/browser/resources/cryptotoken/manifest.json
+++ b/chrome/browser/resources/cryptotoken/manifest.json
@@ -23,10 +23,7 @@
],
"externally_connectable": {
"matches": [
- "https://login.corp.google.com/*",
- "https://accounts.google.com/*",
- "https://myaccount.google.com/*",
- "https://security.google.com/*"
+ "<all_urls>"
],
"ids": [
"fjajfjhkeibgmiggdfehjplbhmfkialk"