Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: chrome/browser/resources/extensions/extension_list.js

Issue 491703003: Fix call to setExtensionAndShowOverlay() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 <include src="extension_error.js"> 5 <include src="extension_error.js">
6 6
7 cr.define('options', function() { 7 cr.define('options', function() {
8 'use strict'; 8 'use strict';
9 9
10 /** 10 /**
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 fileAccess.querySelector('input').checked = extension.allowFileAccess; 188 fileAccess.querySelector('input').checked = extension.allowFileAccess;
189 fileAccess.hidden = false; 189 fileAccess.hidden = false;
190 } 190 }
191 191
192 // The 'Options' link. 192 // The 'Options' link.
193 if (extension.enabled && extension.optionsUrl) { 193 if (extension.enabled && extension.optionsUrl) {
194 var options = node.querySelector('.options-link'); 194 var options = node.querySelector('.options-link');
195 options.addEventListener('click', function(e) { 195 options.addEventListener('click', function(e) {
196 if (this.data_.enableEmbeddedExtensionOptions) { 196 if (this.data_.enableEmbeddedExtensionOptions) {
197 extensions.ExtensionOptionsOverlay.getInstance(). 197 extensions.ExtensionOptionsOverlay.getInstance().
198 setExtensionAndShowOverlay([extension.id], extension.name); 198 setExtensionAndShowOverlay(extension.id, extension.name);
199 } else { 199 } else {
200 chrome.send('extensionSettingsOptions', [extension.id]); 200 chrome.send('extensionSettingsOptions', [extension.id]);
201 } 201 }
202 e.preventDefault(); 202 e.preventDefault();
203 }.bind(this)); 203 }.bind(this));
204 options.hidden = false; 204 options.hidden = false;
205 } 205 }
206 206
207 // The 'Permissions' link. 207 // The 'Permissions' link.
208 var permissions = node.querySelector('.permissions-link'); 208 var permissions = node.querySelector('.permissions-link');
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 topScroll -= pad / 2; 414 topScroll -= pad / 2;
415 setScrollTopForDocument(document, topScroll); 415 setScrollTopForDocument(document, topScroll);
416 } 416 }
417 }, 417 },
418 }; 418 };
419 419
420 return { 420 return {
421 ExtensionsList: ExtensionsList 421 ExtensionsList: ExtensionsList
422 }; 422 };
423 }); 423 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698