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

Unified Diff: remoting/webapp/manifest.json.jinja2

Issue 299983002: Remove the NPAPI plugin from the webapp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
Index: remoting/webapp/manifest.json.jinja2
diff --git a/remoting/webapp/manifest.json.jinja2 b/remoting/webapp/manifest.json.jinja2
index 81c676b1c7fb470f955447c86db07a94f85aacfd..ed3907ce4775e81a9f09166320ef9ff4b56ce196 100644
--- a/remoting/webapp/manifest.json.jinja2
+++ b/remoting/webapp/manifest.json.jinja2
@@ -42,6 +42,19 @@
"optional_permissions": [
"<all_urls>"
],
+
+{% if webapp_type != 'v1' %}
+ "oauth2": {
+ "client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}",
+ "scopes": [
+ "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email"
+ ]
+ },
+ "sandbox": {
+ "pages": [ "wcs_sandbox.html" ]
+ },
+{% endif %}
+
"permissions": [
"{{ OAUTH2_ACCOUNTS_HOST }}/*",
"{{ OAUTH2_API_BASE_URL }}/*",
@@ -72,30 +85,5 @@
]
}
{% endif %}
- ],
-
-{% if webapp_type == 'v1' %}
- "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 }
- ],
- "requirements": {
- "plugins": {
- "npapi": false
- }
- }
-{% else %}
- "oauth2": {
- "client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}",
- "scopes": [
- "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email"
- ]
- },
- "sandbox": {
- "pages": [ "wcs_sandbox.html" ]
- }
-{% endif %}
-
+ ]
}

Powered by Google App Engine
This is Rietveld 408576698