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

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

Issue 151883005: Revert 248271 "Add a minimum required version to the webapp mani..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1817/src/
Patch Set: Created 6 years, 10 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/host_native_messaging.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 @@ -6,30 +6,15 @@ 5 @@ -5,30 +5,15 @@
6 "manifest_version": 2,
6 "default_locale": "en", 7 "default_locale": "en",
7 "minimum_chrome_version": "32",
8 "app": { 8 "app": {
9 - "launch": { 9 - "launch": {
10 - "local_path": "main.html" 10 - "local_path": "main.html"
11 - } 11 - }
12 - }, 12 - },
13 + "background": { 13 + "background": {
14 + "scripts": ["background.js"] 14 + "scripts": ["background.js"]
15 + } 15 + }
16 + }, 16 + },
17 "icons": { 17 "icons": {
(...skipping 12 matching lines...) Expand all
30 - "matches": [ 30 - "matches": [
31 - "THIRD_PARTY_AUTH_REDIRECT_URL" 31 - "THIRD_PARTY_AUTH_REDIRECT_URL"
32 - ], 32 - ],
33 - "js": [ "cs_third_party_auth_trampoline.js" ] 33 - "js": [ "cs_third_party_auth_trampoline.js" ]
34 - } 34 - }
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 @@ -43,16 +29,22 @@ 40 @@ -42,16 +28,22 @@
41 "clipboardRead", 41 "clipboardRead",
42 "clipboardWrite", 42 "clipboardWrite",
43 - "nativeMessaging" 43 - "nativeMessaging"
44 + "nativeMessaging", 44 + "nativeMessaging",
45 + "fullscreen", 45 + "fullscreen",
46 + "identity", 46 + "identity",
47 + "contextMenus" 47 + "contextMenus"
48 ], 48 ],
49 - "plugins": [ 49 - "plugins": [
50 - { "path": "remoting_host_plugin.dll", "public": false }, 50 - { "path": "remoting_host_plugin.dll", "public": false },
51 - { "path": "libremoting_host_plugin.ia32.so", "public": false }, 51 - { "path": "libremoting_host_plugin.ia32.so", "public": false },
52 - { "path": "libremoting_host_plugin.x64.so", "public": false }, 52 - { "path": "libremoting_host_plugin.x64.so", "public": false },
53 - { "path": "remoting_host_plugin.plugin", "public": false } 53 - { "path": "remoting_host_plugin.plugin", "public": false }
54 - ], 54 - ],
55 + "oauth2": { 55 + "oauth2": {
56 + "client_id": "REMOTING_IDENTITY_API_CLIENT_ID", 56 + "client_id": "REMOTING_IDENTITY_API_CLIENT_ID",
57 + "scopes": [ 57 + "scopes": [
58 + "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/au th/googletalk https://www.googleapis.com/auth/userinfo#email" 58 + "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/au th/googletalk https://www.googleapis.com/auth/userinfo#email"
59 + ] 59 + ]
60 + }, 60 + },
61 "requirements": { 61 "requirements": {
62 "plugins": { 62 "plugins": {
63 "npapi": false 63 "npapi": false
64 } 64 }
65 + }, 65 + },
66 + "sandbox": { 66 + "sandbox": {
67 + "pages": [ "wcs_sandbox.html" ] 67 + "pages": [ "wcs_sandbox.html" ]
68 } 68 }
69 } 69 }
OLDNEW
« no previous file with comments | « no previous file | remoting/webapp/host_native_messaging.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698