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="../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 | 11 |
11 <if expr="pp_ifdef('chromeos')"> | 12 <if expr="pp_ifdef('chromeos')"> |
12 <include src="chromeos/kiosk_apps.js"></include> | 13 <include src="chromeos/kiosk_apps.js"></include> |
13 </if> | 14 </if> |
14 | 15 |
15 // Used for observing function of the backend datasource for this page by | 16 // Used for observing function of the backend datasource for this page by |
16 // tests. | 17 // tests. |
17 var webuiResponded = false; | 18 var webuiResponded = false; |
18 | 19 |
19 cr.define('extensions', function() { | 20 cr.define('extensions', function() { |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 // Hook up the configure commands link to the overlay. | 127 // Hook up the configure commands link to the overlay. |
127 var link = document.querySelector('.extension-commands-config'); | 128 var link = document.querySelector('.extension-commands-config'); |
128 link.addEventListener('click', | 129 link.addEventListener('click', |
129 this.handleExtensionCommandsConfig_.bind(this)); | 130 this.handleExtensionCommandsConfig_.bind(this)); |
130 | 131 |
131 // Initialize the Commands overlay. | 132 // Initialize the Commands overlay. |
132 var extensionCommandsOverlay = | 133 var extensionCommandsOverlay = |
133 extensions.ExtensionCommandsOverlay.getInstance(); | 134 extensions.ExtensionCommandsOverlay.getInstance(); |
134 extensionCommandsOverlay.initializePage(); | 135 extensionCommandsOverlay.initializePage(); |
135 | 136 |
| 137 var extensionErrorOverlay = |
| 138 extensions.ExtensionErrorOverlay.getInstance(); |
| 139 extensionErrorOverlay.initializePage(); |
| 140 |
136 // Initialize the kiosk overlay. | 141 // Initialize the kiosk overlay. |
137 if (cr.isChromeOS) { | 142 if (cr.isChromeOS) { |
138 var kioskOverlay = extensions.KioskAppsOverlay.getInstance(); | 143 var kioskOverlay = extensions.KioskAppsOverlay.getInstance(); |
139 kioskOverlay.initialize(); | 144 kioskOverlay.initialize(); |
140 | 145 |
141 $('add-kiosk-app').addEventListener('click', function() { | 146 $('add-kiosk-app').addEventListener('click', function() { |
142 ExtensionSettings.showOverlay($('kiosk-apps-page')); | 147 ExtensionSettings.showOverlay($('kiosk-apps-page')); |
143 kioskOverlay.didShowPage(); | 148 kioskOverlay.didShowPage(); |
144 }); | 149 }); |
145 | 150 |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 return { | 412 return { |
408 ExtensionSettings: ExtensionSettings | 413 ExtensionSettings: ExtensionSettings |
409 }; | 414 }; |
410 }); | 415 }); |
411 | 416 |
412 var ExtensionSettings = extensions.ExtensionSettings; | 417 var ExtensionSettings = extensions.ExtensionSettings; |
413 | 418 |
414 window.addEventListener('load', function(e) { | 419 window.addEventListener('load', function(e) { |
415 ExtensionSettings.getInstance().initialize(); | 420 ExtensionSettings.getInstance().initialize(); |
416 }); | 421 }); |
OLD | NEW |