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

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

Issue 150663013: Integrate ErrorConsole with Apps Dev Tool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dan's and Finnur's Created 6 years, 10 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"></include> 5 <include src="../uber/uber_utils.js"></include>
6 <include src="extension_commands_overlay.js"></include> 6 <include src="extension_commands_overlay.js"></include>
7 <include src="extension_focus_manager.js"></include> 7 <include src="extension_focus_manager.js"></include>
8 <include src="extension_list.js"></include> 8 <include src="extension_list.js"></include>
9 <include src="pack_extension_overlay.js"></include> 9 <include src="pack_extension_overlay.js"></include>
10 <include src="extension_error_overlay.js"></include> 10 <include src="extension_error_overlay.js"></include>
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 extensions.PackExtensionOverlay.getInstance().initializePage(); 122 extensions.PackExtensionOverlay.getInstance().initializePage();
123 123
124 // Hook up the configure commands link to the overlay. 124 // Hook up the configure commands link to the overlay.
125 var link = document.querySelector('.extension-commands-config'); 125 var link = document.querySelector('.extension-commands-config');
126 link.addEventListener('click', 126 link.addEventListener('click',
127 this.handleExtensionCommandsConfig_.bind(this)); 127 this.handleExtensionCommandsConfig_.bind(this));
128 128
129 // Initialize the Commands overlay. 129 // Initialize the Commands overlay.
130 extensions.ExtensionCommandsOverlay.getInstance().initializePage(); 130 extensions.ExtensionCommandsOverlay.getInstance().initializePage();
131 131
132 extensions.ExtensionErrorOverlay.getInstance().initializePage(); 132 extensions.ExtensionErrorOverlay.getInstance().initializePage(
133 extensions.ExtensionSettings.showOverlay);
133 134
134 // Initialize the kiosk overlay. 135 // Initialize the kiosk overlay.
135 if (cr.isChromeOS) { 136 if (cr.isChromeOS) {
136 var kioskOverlay = extensions.KioskAppsOverlay.getInstance(); 137 var kioskOverlay = extensions.KioskAppsOverlay.getInstance();
137 kioskOverlay.initialize(); 138 kioskOverlay.initialize();
138 139
139 $('add-kiosk-app').addEventListener('click', function() { 140 $('add-kiosk-app').addEventListener('click', function() {
140 ExtensionSettings.showOverlay($('kiosk-apps-page')); 141 ExtensionSettings.showOverlay($('kiosk-apps-page'));
141 kioskOverlay.didShowPage(); 142 kioskOverlay.didShowPage();
142 }); 143 });
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 399
399 // Export 400 // Export
400 return { 401 return {
401 ExtensionSettings: ExtensionSettings 402 ExtensionSettings: ExtensionSettings
402 }; 403 };
403 }); 404 });
404 405
405 window.addEventListener('load', function(e) { 406 window.addEventListener('load', function(e) {
406 extensions.ExtensionSettings.getInstance().initialize(); 407 extensions.ExtensionSettings.getInstance().initialize();
407 }); 408 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698