From fff14f6e66a778ee2dc02be1621195355f50333b Mon Sep 17 00:00:00 2001
From: "viettrungluu@chromium.org"
 <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 5 Jun 2010 05:56:21 +0000
Subject: Revert 48997 [causes Windows unit_tests to hang] - Group plugins in
 about:plugins and show update link for out-of-date ones.

Patch by mavrommatis, original review here:
<http://codereview.chromium.org/1991005>.

Original description follows:
(1) Group plugins with the same name together. (2) Show a download link for
plugin versions with known security problems in about:plugins.

BUG=3910
TEST=Open "chrome://plugins", see that plugins are grouped, and that any vulnerable plugins are marked red. Try enabling and disabling plugin groups.

Review URL: http://codereview.chromium.org/2686001

TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/2652002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49003 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/resources/plugins.html | 230 +++++++++++-----------------------
 1 file changed, 76 insertions(+), 154 deletions(-)

(limited to 'chrome/browser/resources/plugins.html')

diff --git a/chrome/browser/resources/plugins.html b/chrome/browser/resources/plugins.html
index d1a8d46..ba0a4a2 100644
--- a/chrome/browser/resources/plugins.html
+++ b/chrome/browser/resources/plugins.html
@@ -162,7 +162,7 @@ html[dir=rtl] .tmi-mode {
 }
 
 .plugin-disabled > td {
-  background-color: #f0f0f0;
+  background: url('gray.png') 0px 0px;
   color: #a0a0a0;
   padding-bottom: 4px;
   padding-top: 5px;
@@ -173,26 +173,10 @@ html[dir=rtl] .tmi-mode {
   padding-top: 5px;
 }
 
-.plugin-file-disabled {
-  background-color: #f0f0f0;
-  color: #a0a0a0;
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-
-.plugin-file-enabled {
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-
 .plugin {
   border-bottom: 1px solid #cdcdcd;
 }
 
-.critical {
-  color: red;
-}
-
 /* Indent the text related to each plug-in. */
 .plugin-text {
   padding-left: 5px;
@@ -219,10 +203,6 @@ html[dir=rtl] .plugin-text {
   -webkit-border-vertical-spacing: 0;
 }
 
-.plugin-details {
-  padding-left: 1em;
-}
-
 /* Separate the inital line, Description, Location, and MIME Types lines. */
 .plugin-details > div {
   padding-top: 0.1em
@@ -289,41 +269,32 @@ button {
  */
 var pluginDataFormat = {
   'plugins': [
-    { 'name': 'Group Name',
-      'description': 'description',
-      'version': 'version',
-      'update_url': 'http://update/',
-      'critical': true,
-      'enabled': true,
-      'plugin_files': [
-        {
-          'path': '/blahblah/blahblah/MyCrappyPlugin.plugin',
-          'name': 'MyCrappyPlugin',
-          'version': '1.2.3',
-          'description': 'My crappy plugin',
-          'mimeTypes': [
-            { 'description': 'Foo Media',
-              'fileExtensions': [ 'foo' ],
-              'mimeType': 'application/x-my-foo' },
-            { 'description': 'Bar Stuff',
-              'fileExtensions': [ 'bar','baz' ],
-              'mimeType': 'application/my-bar' }
-          ],
-          'enabled': true
-        },
-        {
-          'path': '/foobar/baz/YourGreatPlugin.plugin',
-          'name': 'YourGreatPlugin',
-          'version': '4.5',
-          'description': 'Your great plugin',
-          'mimeTypes': [
-            { 'description': 'Baz Stuff',
-              'fileExtensions': [ 'baz' ],
-              'mimeType': 'application/x-your-baz' }
-          ],
-          'enabled': false
-        }
-      ]
+    {
+      'path': '/blahblah/blahblah/MyCrappyPlugin.plugin',
+      'name': 'MyCrappyPlugin',
+      'version': '1.2.3',
+      'description': 'My crappy plugin',
+      'mimeTypes': [
+        { 'description': 'Foo Media',
+          'fileExtensions': [ 'foo' ],
+          'mimeType': 'application/x-my-foo' },
+        { 'description': 'Bar Stuff',
+          'fileExtensions': [ 'bar','baz' ],
+          'mimeType': 'application/my-bar' }
+      ],
+      'enabled': true
+    },
+    {
+      'path': '/foobar/baz/YourGreatPlugin.plugin',
+      'name': 'YourGreatPlugin',
+      'version': '4.5',
+      'description': 'Your great plugin',
+      'mimeTypes': [
+        { 'description': 'Baz Stuff',
+          'fileExtensions': [ 'baz' ],
+          'mimeType': 'application/x-your-baz' }
+      ],
+      'enabled': false
     }
   ]
 };
@@ -404,10 +375,9 @@ function returnPluginsData(pluginsData){
 /**
  * Handles a 'enable' or 'disable' button getting clicked.
  */
-function handleEnablePlugin(node, enable, is_group) {
+function handleEnablePlugin(node, enable) {
   // Tell the C++ PluginsDOMHandler to enable/disable the plugin.
-  chrome.send('enablePlugin', [String(node.path), String(enable),
-              String(is_group)]);
+  chrome.send('enablePlugin', [node.pluginPath, String(enable)]);
   requestPluginsData();
 }
 
@@ -433,7 +403,7 @@ function toggleTmiMode() {
  * Determines whether a plugin's version should be displayed.
  */
 function shouldDisplayPluginVersion(plugin) {
-  return !!plugin.version && plugin.version != "0";
+  return !!plugin.version;
 }
 
 /**
@@ -510,118 +480,70 @@ document.addEventListener('DOMContentLoaded', requestPluginsData);
           <div class="plugin-text">
             <div>
               <span class="plugin-name" dir="ltr"
-                    jscontent="name">NAME</span>
-              <span jsdisplay="plugin_files.length > 1"
-                  jscontent="'(' + plugin_files.length +' files)'">(x)</span>
+                    jscontent="name">PLUGIN NAME</span>
               <span jsdisplay="shouldDisplayPluginVersion($this)">
                 - <span i18n-content="pluginVersion">VERSION</span>
-                <span jsvalues=".className:critical? 'critical': ''"
-                    dir="ltr" jscontent="version">x.x.x.x</span>
+                <span dir="ltr" jscontent="version">x.x.x.x</span>
               </span>
-              <a jsdisplay="critical" jsvalues=".href:update_url"
-                    i18n-content="pluginDownload">DOWNLOAD UPDATE</a>
               <span jsdisplay="!enabled"
                     i18n-content="pluginDisabled">(DISABLED)</span>
-              <div jsdisplay="shouldDisplayPluginDescription($this)">
-                <span dir="ltr" jsvalues=".innerHTML:description">
-              </div>
             </div>
-            <div jsselect="plugin_files" class="plugin-details">
+            <div class="plugin-details">
+              <div><table><tr jsdisplay="shouldDisplayPluginDescription($this)">
+                <td class="plugin-details-label"
+                    i18n-content="pluginDescription">DESCRIPTION:</td>
+                <td><span dir="ltr" jsvalues=".innerHTML:description"></td>
+              </tr></table></div>
+              <div><table><tr>
+                <td class="plugin-details-label"
+                    i18n-content="pluginPath">PATH:</td>
+                <td><span dir="ltr" jscontent="path"></span></td>
+              </tr></table></div>
               <div class="showInTmiMode">
-                <div jsvalues=
-                  ".className:enabled ? 'plugin-file-enabled' : 'plugin-file-disabled'">
-                  <div><table><tr>
-                    <td class="plugin-details-label"
-                        i18n-content="pluginName">NAME:</td>
-                    <td><span dir="ltr" jscontent="name">NAME</span></td>
-                  </tr></table></div>
-                  <div><table><tr jsdisplay="shouldDisplayPluginDescription($this)">
-                    <td class="plugin-details-label"
-                        i18n-content="pluginDescription">DESCRIPTION:</td>
-                    <td><span dir="ltr" jsvalues=".innerHTML:description"></td>
-                  </tr></table></div>
-                  <div><table><tr>
-                    <td class="plugin-details-label"
-                        i18n-content="pluginVersion">VERSION:</td>
-                    <td><span dir="ltr" jscontent="version">x.x.x.x</span></td>
-                  </tr></table></div>
-                  <div><table><tr>
-                    <td class="plugin-details-label"
-                        i18n-content="pluginPriority">PRIORITY:</td>
-                    <td><span dir="ltr" jscontent="priority">x</span></td>
-                  </tr></table></div>
-                  <div><table><tr>
-                    <td class="plugin-details-label"
-                        i18n-content="pluginPath">PATH:</td>
-                    <td><span dir="ltr" jscontent="path"></span></td>
-                  </tr></table></div>
-                  <div><table><tr>
-                    <td class="plugin-details-label">&nbsp;</td>
-                    <td>
-                      <span jsdisplay="!enabled"
-                          i18n-content="pluginDisabled">(DISABLED)</span>
-                      <span>
-                        <a
-                          jsvalues=".path:path"
-                          jsdisplay="enabled"
-                          onclick="handleEnablePlugin(this, false, false)"
-                          href="javascript:void(0);"
-                          i18n-content="disable"
-                          >DISABLE</a>
-                        <a
-                          jsvalues=".path:path"
-                          jsdisplay="!enabled"
-                          onclick="handleEnablePlugin(this, true, false)"
-                          href="javascript:void(0);"
-                          i18n-content="enable"
-                          >ENABLE</a>
-                      </span>
-                    </td>
-                  </tr></table></div>
-                  <table><tr jsdisplay="mimeTypes.length > 0">
-                    <td class="plugin-details-label"
-                        i18n-content="pluginMimeTypes">MIME_TYPES:</td>
-                    <td><table width="100%" class="mime-types">
-                      <tr class="header">
-                        <td i18n-content="pluginMimeTypesMimeType"
-                            >MIME type</td>
-                        <td i18n-content="pluginMimeTypesDescription"
-                            >DESCRIPTION</td>
-                        <td i18n-content="pluginMimeTypesFileExtensions"
-                            >FILE_EXTENSIONS</td>
-                      </tr>
-                      <tr jsselect="mimeTypes">
-                        <td><span dir="ltr"
-                                  jscontent="mimeType"></span></td>
-                        <td><span dir="ltr"
-                                  jsvalues=".innerHTML:description"></span></td>
-                        <td><table jsdisplay="fileExtensions.length > 0"
-                                   class="hlisting">
-                          <tr><td jsselect="fileExtensions">
-                            <span dir="ltr" jscontent="'.' + $this">
-                          </td></tr>
-                        </table></td>
-                      </tr>
-                    </table></td>
-                  </tr></table>
-                </div>
+                <table><tr jsdisplay="mimeTypes.length > 0">
+                  <td class="plugin-details-label"
+                      i18n-content="pluginMimeTypes">MIME_TYPES:</td>
+                  <td><table width="100%" class="mime-types">
+                    <tr class="header">
+                      <td i18n-content="pluginMimeTypesMimeType"
+                          >MIME type</td>
+                      <td i18n-content="pluginMimeTypesDescription"
+                          >DESCRIPTION</td>
+                      <td i18n-content="pluginMimeTypesFileExtensions"
+                          >FILE_EXTENSIONS</td>
+                    </tr>
+                    <tr jsselect="mimeTypes">
+                      <td><span dir="ltr"
+                                jscontent="mimeType"></span></td>
+                      <td><span dir="ltr"
+                                jsvalues=".innerHTML:description"></span></td>
+                      <td><table jsdisplay="fileExtensions.length > 0"
+                                 class="hlisting">
+                        <tr><td jsselect="fileExtensions">
+                          <span dir="ltr" jscontent="'.' + $this">
+                        </td></tr>
+                      </table></td>
+                    </tr>
+                  </table></td>
+                </tr></table>
               </div>
             </div>
           </div>
+
           <div class="plugin-actions">
             <span>
               <a
-                jsvalues=".path:name"
+                jsvalues=".pluginPath:path"
                 jsdisplay="enabled"
-                onclick="handleEnablePlugin(this, false, true)"
-                href="javascript:void(0);"
+                onclick="handleEnablePlugin(this, false)"
+                href="javascript:void();"
                 i18n-content="disable"
                 >DISABLE</a>
               <a
-                jsvalues=".path:name"
+                jsvalues=".pluginPath:path"
                 jsdisplay="!enabled"
-                onclick="handleEnablePlugin(this, true, true)"
-                href="javascript:void(0);"
+                onclick="handleEnablePlugin(this, true)"
+                href="javascript:void();"
                 i18n-content="enable"
                 >ENABLE</a>
             </span>
-- 
cgit v1.1