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

Unified Diff: remoting/webapp/client_session.js

Issue 234023003: Build remoting for PNaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update net.gypi 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
« no previous file with comments | « remoting/webapp/build-webapp.py ('k') | remoting/webapp/manifest.json.jinja2 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/client_session.js
diff --git a/remoting/webapp/client_session.js b/remoting/webapp/client_session.js
index 23c88144b9484978d4d3f8ec9204259e3b2958d8..12b46e5b10459f975e33559e5534401d70081428 100644
--- a/remoting/webapp/client_session.js
+++ b/remoting/webapp/client_session.js
@@ -363,8 +363,17 @@ remoting.ClientSession.prototype.createClientPlugin_ =
document.createElement('embed');
plugin.id = id;
- plugin.src = 'about://none';
- plugin.type = 'application/vnd.chromium.remoting-viewer';
+ if (remoting.settings.CLIENT_PLUGIN_TYPE == 'pnacl') {
+ plugin.src = 'remoting_client_pnacl.nmf';
+ plugin.type = 'application/x-pnacl';
+ } else if (remoting.settings.CLIENT_PLUGIN_TYPE == 'nacl') {
+ plugin.src = 'remoting_client_nacl.nmf';
+ plugin.type = 'application/x-nacl';
+ } else {
+ plugin.src = 'about://none';
+ plugin.type = 'application/vnd.chromium.remoting-viewer';
+ }
+
plugin.width = 0;
plugin.height = 0;
plugin.tabIndex = 0; // Required, otherwise focus() doesn't work.
@@ -1500,4 +1509,4 @@ remoting.ClientSession.prototype.getClientArea_ = function() {
return remoting.windowFrame ?
remoting.windowFrame.getClientArea() :
{ 'width': window.innerWidth, 'height': window.innerHeight };
-}
+}
« no previous file with comments | « remoting/webapp/build-webapp.py ('k') | remoting/webapp/manifest.json.jinja2 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698