Merge 182274

chrome/browser/resources/extensions/extension_list.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.
 
 cr.define('options', function() {
   'use strict';
 
   /**
    * A lookup helper function to find the first node that has an id (starting
    * at |node| and going up the parent chain).
@@ skipping 132 matching lines @@
       if (extension.wantsFileAccess) {
         var fileAccess = node.querySelector('.file-access-control');
         fileAccess.addEventListener('click', function(e) {
           chrome.send('extensionSettingsAllowFileAccess',
                       [extension.id, String(e.target.checked)]);
         });
         fileAccess.querySelector('input').checked = extension.allowFileAccess;
         fileAccess.hidden = false;
       }
 
-      // The 'Options' link.
+      // The 'Options' checkbox.
       if (extension.enabled && extension.optionsUrl) {
         var options = node.querySelector('.options-link');
         options.addEventListener('click', function(e) {
           chrome.send('extensionSettingsOptions', [extension.id]);
           e.preventDefault();
         });
         options.hidden = false;
       }
 
-      // The 'Permissions' link.
-      var permissions = node.querySelector('.permissions-link');
-      permissions.addEventListener('click', function(e) {
-        chrome.send('extensionSettingsPermissions', [extension.id]);
-        e.preventDefault();
-      });
-
       if (extension.allow_activity) {
         var activity = node.querySelector('.activity-link');
         activity.addEventListener('click', function(e) {
           chrome.send('navigateToUrl', [
             'chrome://extension-activity?extensionId=' + extension.id,
             '_blank',
             e.button,
             e.altKey,
             e.ctrlKey,
             e.metaKey,
@@ skipping 148 matching lines @@
       }
 
       this.appendChild(node);
     }
   };
 
   return {
     ExtensionsList: ExtensionsList
   };
 });