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

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

Issue 22938005: Add ErrorConsole UI for Extension Install Warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ec_install_warnings
Patch Set: Yoyo's + temporarily remove *.png for apply issue Created 7 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"></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
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();
Dan Beam 2013/08/20 21:39:26 nit: extensions.ExtensionErrorOverlay.getInstance(
Devlin 2013/08/20 23:06:51 Done (and fixed neighbors).
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
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 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698