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

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

Issue 475543003: Display extension options in a WebUI overlay instead of in a new tab (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
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 [extension.id, String(e.target.checked)]); 186 [extension.id, String(e.target.checked)]);
187 }); 187 });
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 chrome.send('extensionSettingsOptions', [extension.id]); 196 if (this.data_.enableEmbeddedExtensionOptions) {
197 extensions.ExtensionOptionsOverlay.getInstance().
198 setExtensionAndShowOverlay([extension.id], extension.name);
Vitaly Pavlenko 2014/08/21 22:46:21 setExtensionAndShowOverlay() gets {string} as firs
199 } else {
200 chrome.send('extensionSettingsOptions', [extension.id]);
201 }
197 e.preventDefault(); 202 e.preventDefault();
198 }); 203 }.bind(this));
199 options.hidden = false; 204 options.hidden = false;
200 } 205 }
201 206
202 // The 'Permissions' link. 207 // The 'Permissions' link.
203 var permissions = node.querySelector('.permissions-link'); 208 var permissions = node.querySelector('.permissions-link');
204 permissions.addEventListener('click', function(e) { 209 permissions.addEventListener('click', function(e) {
205 chrome.send('extensionSettingsPermissions', [extension.id]); 210 chrome.send('extensionSettingsPermissions', [extension.id]);
206 e.preventDefault(); 211 e.preventDefault();
207 }); 212 });
208 213
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 topScroll -= pad / 2; 414 topScroll -= pad / 2;
410 setScrollTopForDocument(document, topScroll); 415 setScrollTopForDocument(document, topScroll);
411 } 416 }
412 }, 417 },
413 }; 418 };
414 419
415 return { 420 return {
416 ExtensionsList: ExtensionsList 421 ExtensionsList: ExtensionsList
417 }; 422 };
418 }); 423 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698