Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: remoting/webapp/manifest.json

Issue 12905012: Webapp changes to support third party authentication (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase, update patch Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/webapp/main.html ('k') | remoting/webapp/oauth2.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/manifest.json
diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
index 13f93466a9fad2e46644bb94abe01deb77a3070d..d1f8d1f07e0c7d67bf00bcca3be5a7deb2744ea8 100644
--- a/remoting/webapp/manifest.json
+++ b/remoting/webapp/manifest.json
@@ -20,9 +20,18 @@
"OAUTH2_REDIRECT_URL"
],
"js": [ "cs_oauth2_trampoline.js" ]
+ },
+ {
+ "matches": [
+ "THIRD_PARTY_AUTH_REDIRECT_URL"
+ ],
+ "js": [ "cs_third_party_auth_trampoline.js" ]
}
],
"content_security_policy": "default-src 'self'; script-src 'self' TALK_GADGET_HOST; style-src 'self' https://fonts.googleapis.com; img-src 'self' TALK_GADGET_HOST; font-src *; connect-src 'self' OAUTH2_ACCOUNTS_HOST GOOGLE_API_HOSTS TALK_GADGET_HOST https://relay.google.com",
+ "optional_permissions": [
+ "<all_urls>"
+ ],
"permissions": [
"OAUTH2_ACCOUNTS_HOST/*",
"OAUTH2_API_BASE_URL/*",
@@ -31,7 +40,7 @@
"https://relay.google.com/*",
"storage",
"clipboardRead",
- "clipboardWrite"
+ "clipboardWrite",
],
"plugins": [
{ "path": "remoting_host_plugin.dll", "public": false },
« no previous file with comments | « remoting/webapp/main.html ('k') | remoting/webapp/oauth2.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698