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

Side by Side Diff: chrome/browser/resources/extensions/extensions.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="../uber/uber_utils.js"> 5 <include src="../uber/uber_utils.js">
6 <include src="extension_code.js"> 6 <include src="extension_code.js">
7 <include src="extension_commands_overlay.js"> 7 <include src="extension_commands_overlay.js">
8 <include src="extension_focus_manager.js"> 8 <include src="extension_focus_manager.js">
9 <include src="extension_list.js"> 9 <include src="extension_list.js">
10 <include src="pack_extension_overlay.js"> 10 <include src="pack_extension_overlay.js">
11 <include src="extension_error_overlay.js"> 11 <include src="extension_error_overlay.js">
12 <include src="extension_loader.js"> 12 <include src="extension_loader.js">
13 <include src="extension_options_overlay.js">
13 14
14 <if expr="chromeos"> 15 <if expr="chromeos">
15 <include src="chromeos/kiosk_apps.js"> 16 <include src="chromeos/kiosk_apps.js">
16 </if> 17 </if>
17 18
18 // Used for observing function of the backend datasource for this page by 19 // Used for observing function of the backend datasource for this page by
19 // tests. 20 // tests.
20 var webuiResponded = false; 21 var webuiResponded = false;
21 22
22 cr.define('extensions', function() { 23 cr.define('extensions', function() {
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 var link = document.querySelector('.extension-commands-config'); 147 var link = document.querySelector('.extension-commands-config');
147 link.addEventListener('click', 148 link.addEventListener('click',
148 this.handleExtensionCommandsConfig_.bind(this)); 149 this.handleExtensionCommandsConfig_.bind(this));
149 150
150 // Initialize the Commands overlay. 151 // Initialize the Commands overlay.
151 extensions.ExtensionCommandsOverlay.getInstance().initializePage(); 152 extensions.ExtensionCommandsOverlay.getInstance().initializePage();
152 153
153 extensions.ExtensionErrorOverlay.getInstance().initializePage( 154 extensions.ExtensionErrorOverlay.getInstance().initializePage(
154 extensions.ExtensionSettings.showOverlay); 155 extensions.ExtensionSettings.showOverlay);
155 156
157 extensions.ExtensionOptionsOverlay.getInstance().initializePage(
158 extensions.ExtensionSettings.showOverlay);
159
156 // Initialize the kiosk overlay. 160 // Initialize the kiosk overlay.
157 if (cr.isChromeOS) { 161 if (cr.isChromeOS) {
158 var kioskOverlay = extensions.KioskAppsOverlay.getInstance(); 162 var kioskOverlay = extensions.KioskAppsOverlay.getInstance();
159 kioskOverlay.initialize(); 163 kioskOverlay.initialize();
160 164
161 $('add-kiosk-app').addEventListener('click', function() { 165 $('add-kiosk-app').addEventListener('click', function() {
162 ExtensionSettings.showOverlay($('kiosk-apps-page')); 166 ExtensionSettings.showOverlay($('kiosk-apps-page'));
163 kioskOverlay.didShowPage(); 167 kioskOverlay.didShowPage();
164 }); 168 });
165 169
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 440
437 // Export 441 // Export
438 return { 442 return {
439 ExtensionSettings: ExtensionSettings 443 ExtensionSettings: ExtensionSettings
440 }; 444 };
441 }); 445 });
442 446
443 window.addEventListener('load', function(e) { 447 window.addEventListener('load', function(e) {
444 extensions.ExtensionSettings.getInstance().initialize(); 448 extensions.ExtensionSettings.getInstance().initialize();
445 }); 449 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698