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

Side by Side Diff: remoting/webapp/appsv2.patch

Issue 22339015: s/experimental.identity/identity (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/webapp/identity.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json 1 diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
2 index d1f8d1f..67bf660 100644 2 index d1f8d1f..67bf660 100644
3 --- a/manifest.json 3 --- a/manifest.json
4 +++ b/manifest.json 4 +++ b/manifest.json
5 @@ -5,30 +5,15 @@ 5 @@ -5,30 +5,15 @@
6 "manifest_version": 2, 6 "manifest_version": 2,
7 "default_locale": "en", 7 "default_locale": "en",
8 "app": { 8 "app": {
9 - "launch": { 9 - "launch": {
10 - "local_path": "main.html" 10 - "local_path": "main.html"
(...skipping 24 matching lines...) Expand all
35 - ], 35 - ],
36 - "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", 36 - "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",
37 "optional_permissions": [ 37 "optional_permissions": [
38 "<all_urls>" 38 "<all_urls>"
39 ], 39 ],
40 @@ -42,16 +28,21 @@ 40 @@ -42,16 +28,21 @@
41 "clipboardRead", 41 "clipboardRead",
42 "clipboardWrite", 42 "clipboardWrite",
43 - "nativeMessaging" 43 - "nativeMessaging"
44 + "nativeMessaging", 44 + "nativeMessaging",
45 + "experimental",
46 + "fullscreen" 45 + "fullscreen"
46 + "identity",
47 ], 47 ],
48 - "plugins": [ 48 - "plugins": [
49 - { "path": "remoting_host_plugin.dll", "public": false }, 49 - { "path": "remoting_host_plugin.dll", "public": false },
50 - { "path": "libremoting_host_plugin.ia32.so", "public": false }, 50 - { "path": "libremoting_host_plugin.ia32.so", "public": false },
51 - { "path": "libremoting_host_plugin.x64.so", "public": false }, 51 - { "path": "libremoting_host_plugin.x64.so", "public": false },
52 - { "path": "remoting_host_plugin.plugin", "public": false } 52 - { "path": "remoting_host_plugin.plugin", "public": false }
53 - ], 53 - ],
54 + "oauth2": { 54 + "oauth2": {
55 + "client_id": "45833509441-oqgdhgddn085c7cq9djknefjo0tedtua.apps.googleuserc ontent.com", 55 + "client_id": "45833509441-oqgdhgddn085c7cq9djknefjo0tedtua.apps.googleuserc ontent.com",
56 + "scopes": [ 56 + "scopes": [
57 + "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/au th/googletalk https://www.googleapis.com/auth/userinfo#email" 57 + "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/au th/googletalk https://www.googleapis.com/auth/userinfo#email"
58 + ] 58 + ]
59 + }, 59 + },
60 "requirements": { 60 "requirements": {
61 "plugins": { 61 "plugins": {
62 "npapi": false 62 "npapi": false
63 } 63 }
64 + }, 64 + },
65 + "sandbox": { 65 + "sandbox": {
66 + "pages": [ "wcs_sandbox.html" ] 66 + "pages": [ "wcs_sandbox.html" ]
67 } 67 }
68 } 68 }
OLDNEW
« no previous file with comments | « no previous file | remoting/webapp/identity.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698