Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

chrome/browser/resources/plugins.js

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 /**
  * This variable structure is here to document the structure that the template
  * expects to correctly populate the page.
  */
 var pluginDataFormat = {
   'plugins': [
     {
@@ skipping 106 matching lines @@
   bodyContainer.style.visibility = 'hidden';
   body.className = '';
   var slidables = document.getElementsByClassName('showInTmiMode');
   for (var i = 0; i < slidables.length; i++)
     slidables[i].style.height = 'auto';
 
   renderTemplate(pluginsData);
 
   // Add handlers to dynamically created HTML elements.
   var links = document.getElementsByClassName('disable-plugin-link');
-  for (var i = 0; i < links.length; ++i) {
+  for (var i = 0; i < links.length; i++) {
     links[i].onclick = function () {
       handleEnablePlugin(this, false, false);
       return false;
     };
   }
   links = document.getElementsByClassName('enable-plugin-link');
-  for (var i = 0; i < links.length; ++i) {
+  for (var i = 0; i < links.length; i++) {
     links[i].onclick = function () {
       handleEnablePlugin(this, true, false);
       return false;
     };
   }
   links = document.getElementsByClassName('disable-group-link');
-  for (var i = 0; i < links.length; ++i) {
+  for (var i = 0; i < links.length; i++) {
     links[i].onclick = function () {
       handleEnablePlugin(this, false, true);
       return false;
     };
   }
   links = document.getElementsByClassName('enable-group-link');
-  for (var i = 0; i < links.length; ++i) {
+  for (var i = 0; i < links.length; i++) {
     links[i].onclick = function () {
       handleEnablePlugin(this, true, true);
       return false;
     };
   }
+  var checkboxes = document.getElementsByClassName('always-allow');
+  for (var i = 0; i < checkboxes.length; i++) {
+    checkboxes[i].onclick = function () {
+      handleSetPluginAlwaysAllowed(this)
+    };
+  };
 
   // Make sure the left column (with "Description:", "Location:", etc.) is the
   // same size for all plugins.
   var labels = document.getElementsByClassName('plugin-details-label');
   var maxLabelWidth = 0;
   for (var i = 0; i < labels.length; i++)
     labels[i].style.width = 'auto';
   for (var i = 0; i < labels.length; i++)
     maxLabelWidth = Math.max(maxLabelWidth, labels[i].offsetWidth);
   for (var i = 0; i < labels.length; i++)
@@ skipping 37 matching lines @@
       tmiModeExpanded ? 'inline' : 'none';
   document.getElementById('expand').style.display =
       tmiModeExpanded ? 'none' : 'inline';
 
   document.body.className =
       tmiModeExpanded ? 'showTmiMode' : 'hideTmiMode';
 
   chrome.send('saveShowDetailsToPrefs', [String(tmiModeExpanded)]);
 }
 
+function handleSetPluginAlwaysAllowed(el) {
+  chrome.send('setPluginAlwaysAllowed', [el.identifier, el.checked]);
+}
+
 /**
  * Determines whether a plugin's version should be displayed.
  */
 function shouldDisplayPluginVersion(plugin) {
   return !!plugin.version && plugin.version != '0';
 }
 
 /**
  * Determines whether a plugin's description should be displayed.
  */
@@ skipping 20 matching lines @@
 setInterval(requestPluginsData, 30000);
 
 // Get data and have it displayed upon loading.
 document.addEventListener('DOMContentLoaded', requestPluginsData);
 
 // Add handlers to static HTML elements.
 document.getElementById('collapse').onclick = toggleTmiMode;
 document.getElementById('expand').onclick = toggleTmiMode;
 document.getElementById('details-link').onclick = toggleTmiMode;