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

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

Issue 518653002: Add the "options_ui" extension manifest field. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix flag logic and define directive Created 6 years, 3 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
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 /** 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 [extension.id, String(e.target.checked)]); 265 [extension.id, String(e.target.checked)]);
266 }); 266 });
267 fileAccess.querySelector('input').checked = extension.allowFileAccess; 267 fileAccess.querySelector('input').checked = extension.allowFileAccess;
268 fileAccess.hidden = false; 268 fileAccess.hidden = false;
269 } 269 }
270 270
271 // The 'Options' link. 271 // The 'Options' link.
272 if (extension.enabled && extension.optionsUrl) { 272 if (extension.enabled && extension.optionsUrl) {
273 var options = node.querySelector('.options-link'); 273 var options = node.querySelector('.options-link');
274 options.addEventListener('click', function(e) { 274 options.addEventListener('click', function(e) {
275 if (this.data_.enableEmbeddedExtensionOptions) { 275 if (!extension.options_open_in_tab) {
Devlin 2014/09/02 21:42:29 nit: no unix_hacker_style in js.
ericzeng 2014/09/03 17:52:13 Done.
276 this.showEmbeddedExtensionOptions_(extension.id, false); 276 this.showEmbeddedExtensionOptions_(extension.id, false);
277 } else { 277 } else {
278 chrome.send('extensionSettingsOptions', [extension.id]); 278 chrome.send('extensionSettingsOptions', [extension.id]);
279 } 279 }
280 e.preventDefault(); 280 e.preventDefault();
281 }.bind(this)); 281 }.bind(this));
282 options.hidden = false; 282 options.hidden = false;
283 } 283 }
284 284
285 // The 'Permissions' link. 285 // The 'Permissions' link.
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 $('overlay').addEventListener('cancelOverlay', function() { 529 $('overlay').addEventListener('cancelOverlay', function() {
530 this.optionsShown_ = false; 530 this.optionsShown_ = false;
531 }.bind(this)); 531 }.bind(this));
532 }, 532 },
533 }; 533 };
534 534
535 return { 535 return {
536 ExtensionsList: ExtensionsList 536 ExtensionsList: ExtensionsList
537 }; 537 };
538 }); 538 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698