Use PNaCl in V2 builds of the remoting webapp

remoting/webapp/client_plugin.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Class that wraps low-level details of interacting with the client plugin.
  *
  * This abstracts a <embed> element and controls the plugin which does
  * the actual remoting work. It also handles differences between
@@ skipping 66 matching lines @@
   this.onPairingComplete_ = function(clientId, sharedSecret) {};
   /** @type {remoting.ClientSession.PerfStats} */
   this.perfStats_ = new remoting.ClientSession.PerfStats();
 
   /** @type {remoting.ClientPlugin} */
   var that = this;
   /** @param {Event} event Message event from the plugin. */
   this.plugin.addEventListener('message', function(event) {
       that.handleMessage_(event.data);
     }, false);
-  window.setTimeout(this.showPluginForClickToPlay_.bind(this), 500);
+
+  if (remoting.settings.CLIENT_PLUGIN_TYPE == 'native') {
+    window.setTimeout(this.showPluginForClickToPlay_.bind(this), 500);
+  }
 };
 
 /**
  * Set of features for which hasFeature() can be used to test.
  *
  * @enum {string}
  */
 remoting.ClientPlugin.Feature = {
   INJECT_KEY_EVENT: 'injectKeyEvent',
   NOTIFY_CLIENT_RESOLUTION: 'notifyClientResolution',
@@ skipping 616 matching lines @@
  * Undo the CSS rules needed to make the plugin clickable for click-to-play.
  * @private
  */
 remoting.ClientPlugin.prototype.hidePluginForClickToPlay_ = function() {
   this.plugin.style.width = '';
   this.plugin.style.height = '';
   this.plugin.style.top = '';
   this.plugin.style.left = '';
   this.plugin.style.position = '';
 };