Merge 182576 to M26 beta branch.

chrome/browser/resources/extensions/extension_list.js

Index: chrome/browser/resources/extensions/extension_list.js
===================================================================
--- chrome/browser/resources/extensions/extension_list.js	(revision 183257)
+++ chrome/browser/resources/extensions/extension_list.js	(working copy)
@@ -150,7 +150,7 @@
         fileAccess.hidden = false;
       }
 
-      // The 'Options' checkbox.
+      // The 'Options' link.
       if (extension.enabled && extension.optionsUrl) {
         var options = node.querySelector('.options-link');
         options.addEventListener('click', function(e) {
@@ -160,6 +160,13 @@
         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) {