rAc - revert invalid suggestions to edit mode
[chromium-blink-merge.git] / remoting / webapp / appsv2.patch
bloba8e9009b43c04c761471ff972d46c6a7eacdf137
1 diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
2 index d1f8d1f..67bf660 100644
3 --- a/manifest.json
4 +++ b/manifest.json
5 @@ -6,30 +6,15 @@
6 "default_locale": "en",
7 "minimum_chrome_version": "32",
8 "app": {
9 - "launch": {
10 - "local_path": "main.html"
11 - }
12 - },
13 + "background": {
14 + "scripts": ["background.js"]
15 + }
16 + },
17 "icons": {
18 "128": "chromoting128.webp",
19 "48": "chromoting48.webp",
20 "16": "chromoting16.webp"
22 - "content_scripts": [
23 - {
24 - "matches": [
25 - "OAUTH2_REDIRECT_URL"
26 - ],
27 - "js": [ "cs_oauth2_trampoline.js" ]
28 - },
29 - {
30 - "matches": [
31 - "THIRD_PARTY_AUTH_REDIRECT_URL"
32 - ],
33 - "js": [ "cs_third_party_auth_trampoline.js" ]
34 - }
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",
37 "optional_permissions": [
38 "<all_urls>"
40 @@ -43,16 +29,23 @@
41 "clipboardRead",
42 "clipboardWrite",
43 - "nativeMessaging"
44 + "nativeMessaging",
45 + "fullscreen",
46 + "identity",
47 + "contextMenus",
48 + "overrideEscFullscreen"
50 - "plugins": [
51 - { "path": "remoting_host_plugin.dll", "public": false },
52 - { "path": "libremoting_host_plugin.ia32.so", "public": false },
53 - { "path": "libremoting_host_plugin.x64.so", "public": false },
54 - { "path": "remoting_host_plugin.plugin", "public": false }
55 - ],
56 + "oauth2": {
57 + "client_id": "REMOTING_IDENTITY_API_CLIENT_ID",
58 + "scopes": [
59 + "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email"
60 + ]
61 + },
62 "requirements": {
63 "plugins": {
64 "npapi": false
66 + },
67 + "sandbox": {
68 + "pages": [ "wcs_sandbox.html" ]