Use PNaCl in V2 builds of the remoting webapp

Also disabled click-to-play logic for PNaCl plugin BUG=276739 R=jamiewalch@chromium.org Review URL: https://codereview.chromium.org/343983003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278886 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jun 21, 2014 · f89ee43 · f89ee43
1 parent f807090
commit f89ee43
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 38 deletions.
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
@@ -94,13 +94,6 @@
         'remoting_webapp_v1',
         'remoting_webapp_v2',
       ],
-      'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            'remoting_webapp_pnacl',
-          ],
-        }],
-      ],
     },  # end of target 'remoting_webapp'
 
     {
@@ -118,31 +111,29 @@
       'target_name': 'remoting_webapp_v2',
       'type': 'none',
       'variables': {
-        'webapp_type': 'v2',
         'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
         'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
         'extra_files': [ 'webapp/background.js' ],
       },
-      'includes': [ 'remoting_webapp.gypi', ],
-    },  # end of target 'remoting_webapp_v2'
-  ],  # end of targets
-
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          'target_name': 'remoting_webapp_pnacl',
-          'type': 'none',
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            'remoting_nacl.gyp:remoting_client_plugin_nacl',
+          ],
           'variables': {
-            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.pnacl',
-            'zip_path': '<(PRODUCT_DIR)/remoting-webapp-pnacl.zip',
-            'extra_files': [ 'webapp/background.js' ],
             'webapp_type': 'v2_pnacl',
+            'extra_files': [
+              'webapp/remoting_client_pnacl.nmf',
+              '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
+            ],
+          },
+        }, {
+          'variables': {
+            'webapp_type': 'v2',
           },
-          'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_pnacl'
+        }],
       ],
-    }],
-  ],
-
+      'includes': [ 'remoting_webapp.gypi', ],
+    },  # end of target 'remoting_webapp_v2'
+  ],  # end of targets
 }
diff --git a/remoting/remoting_webapp.gypi b/remoting/remoting_webapp.gypi
@@ -18,17 +18,6 @@
     'remoting_webapp_html',
   ],
   'conditions': [
-    ['webapp_type=="v2_pnacl"', {
-      'dependencies': [
-        'remoting_nacl.gyp:remoting_client_plugin_nacl',
-      ],
-      'variables': {
-        'extra_files': [
-          'webapp/remoting_client_pnacl.nmf',
-          '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
-        ],
-      },
-    }],
     ['run_jscompile != 0', {
       'variables': {
         'success_stamp': '<(PRODUCT_DIR)/remoting_webapp_jscompile.stamp',

diff --git a/remoting/webapp/client_plugin.js b/remoting/webapp/client_plugin.js
@@ -84,7 +84,10 @@ remoting.ClientPlugin = function(plugin, onExtensionMessage) {
   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);
+  }
 };
 
 /**