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

Unified Diff: remoting/webapp/appsv2.patch

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/resources/remoting_strings.grd ('k') | remoting/webapp/build-webapp.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/appsv2.patch
diff --git a/remoting/webapp/appsv2.patch b/remoting/webapp/appsv2.patch
index 6ff3063c3577cd4371c1a28070620ff9a2e6673e..3d72941d54f5f5c56de2b2ab8e540577bf82af7b 100644
--- a/remoting/webapp/appsv2.patch
+++ b/remoting/webapp/appsv2.patch
@@ -43,19 +43,21 @@ index 061caeb..f61e532 100644
<script src="log_to_server.js"></script>
<script src="menu_button.js"></script>
diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
-index 5be9243..39052b9 100644
+index d1f8d1f..67bf660 100644
--- a/manifest.json
+++ b/manifest.json
-@@ -5,24 +5,16 @@
+@@ -5,30 +5,16 @@
"manifest_version": 2,
"default_locale": "en",
"app": {
- "launch": {
- "local_path": "main.html"
+- }
+- },
+ "background": {
+ "scripts": ["background.js"]
- }
- },
++ }
++ },
+ "key": "chromotingappsv2",
"icons": {
"128": "chromoting128.webp",
@@ -68,27 +70,30 @@ index 5be9243..39052b9 100644
- "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",
- "permissions": [
- "OAUTH2_ACCOUNTS_HOST/*",
- "OAUTH2_API_BASE_URL/*",
-@@ -30,18 +22,22 @@
- "TALK_GADGET_HOST/talkgadget/*",
- "https://relay.google.com/*",
+ "optional_permissions": [
+ "<all_urls>"
+ ],
+@@ -41,16 +27,20 @@
"storage",
"clipboardRead",
-- "clipboardWrite"
-- ],
+ "clipboardWrite",
++ "experimental"
+ ],
- "plugins": [
- { "path": "remoting_host_plugin.dll", "public": false },
- { "path": "libremoting_host_plugin.ia32.so", "public": false },
- { "path": "libremoting_host_plugin.x64.so", "public": false },
- { "path": "remoting_host_plugin.plugin", "public": false }
-+ "clipboardWrite",
-+ "experimental"
- ],
+- ],
+ "oauth2": {
+ "client_id": "45833509441.apps.googleusercontent.com",
+ "scopes": [
« no previous file with comments | « remoting/resources/remoting_strings.grd ('k') | remoting/webapp/build-webapp.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698