OLD | NEW |
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 /** | 7 /** |
8 * The type of the extension data object. The definition is based on | 8 * The type of the extension data object. The definition is based on |
9 * chrome/browser/ui/webui/extensions/extension_basic_info.cc | 9 * chrome/browser/ui/webui/extensions/extension_basic_info.cc |
10 * and | 10 * and |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 [extension.id, String(e.target.checked)]); | 266 [extension.id, String(e.target.checked)]); |
267 }); | 267 }); |
268 fileAccess.querySelector('input').checked = extension.allowFileAccess; | 268 fileAccess.querySelector('input').checked = extension.allowFileAccess; |
269 fileAccess.hidden = false; | 269 fileAccess.hidden = false; |
270 } | 270 } |
271 | 271 |
272 // The 'Options' link. | 272 // The 'Options' link. |
273 if (extension.enabled && extension.optionsUrl) { | 273 if (extension.enabled && extension.optionsUrl) { |
274 var options = node.querySelector('.options-link'); | 274 var options = node.querySelector('.options-link'); |
275 options.addEventListener('click', function(e) { | 275 options.addEventListener('click', function(e) { |
276 if (this.data_.enableEmbeddedExtensionOptions) { | 276 if (!extension.optionsOpenInTab) { |
277 this.showEmbeddedExtensionOptions_(extension.id, false); | 277 this.showEmbeddedExtensionOptions_(extension.id, false); |
278 } else { | 278 } else { |
279 chrome.send('extensionSettingsOptions', [extension.id]); | 279 chrome.send('extensionSettingsOptions', [extension.id]); |
280 } | 280 } |
281 e.preventDefault(); | 281 e.preventDefault(); |
282 }.bind(this)); | 282 }.bind(this)); |
283 options.hidden = false; | 283 options.hidden = false; |
284 } | 284 } |
285 | 285 |
286 // The 'Permissions' link. | 286 // The 'Permissions' link. |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 $('overlay').addEventListener('cancelOverlay', function() { | 530 $('overlay').addEventListener('cancelOverlay', function() { |
531 this.optionsShown_ = false; | 531 this.optionsShown_ = false; |
532 }.bind(this)); | 532 }.bind(this)); |
533 }, | 533 }, |
534 }; | 534 }; |
535 | 535 |
536 return { | 536 return { |
537 ExtensionsList: ExtensionsList | 537 ExtensionsList: ExtensionsList |
538 }; | 538 }; |
539 }); | 539 }); |
OLD | NEW |