| 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 };
|
| -}
|
| +}
|
|
|