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

Side by Side Diff: chrome/browser/resources/options/chromeos/kiosk_apps.js

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 cr.define('options', function() { 5 cr.define('options', function() {
6 var OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 7
8 /** 8 /**
9 * Encapsulated handling of ChromeOS kiosk apps options page. 9 * Encapsulated handling of ChromeOS kiosk apps options page.
10 * @extends {options.OptionsPage} 10 * @extends {options.OptionsPage}
(...skipping 22 matching lines...) Expand all
33 // Call base class implementation to starts preference initialization. 33 // Call base class implementation to starts preference initialization.
34 OptionsPage.prototype.initializePage.call(this); 34 OptionsPage.prototype.initializePage.call(this);
35 35
36 options.KioskAppList.decorate($('kiosk-app-list')); 36 options.KioskAppList.decorate($('kiosk-app-list'));
37 37
38 $('kiosk-options-overlay-confirm').onclick = 38 $('kiosk-options-overlay-confirm').onclick =
39 OptionsPage.closeOverlay.bind(OptionsPage); 39 OptionsPage.closeOverlay.bind(OptionsPage);
40 $('kiosk-app-id-edit').addEventListener('keypress', 40 $('kiosk-app-id-edit').addEventListener('keypress',
41 this.handleAppIdInputKeyPressed_); 41 this.handleAppIdInputKeyPressed_);
42 42
43 Preferences.getInstance().addEventListener('cros.kiosk.apps', 43 Preferences.getInstance().addEventListener(
44 'cros.accounts.deviceLocalAccounts',
44 this.loadAppsIfVisible_.bind(this)); 45 this.loadAppsIfVisible_.bind(this));
45 Preferences.getInstance().addEventListener('cros.kiosk.auto_launch', 46 Preferences.getInstance().addEventListener(
47 'cros.accounts.deviceLocalAccountAutoLoginId',
46 this.loadAppsIfVisible_.bind(this)); 48 this.loadAppsIfVisible_.bind(this));
47 }, 49 },
48 50
49 /** @override */ 51 /** @override */
50 didShowPage: function() { 52 didShowPage: function() {
51 this.loadAppsIfVisible_(); 53 this.loadAppsIfVisible_();
52 $('kiosk-app-id-edit').focus(); 54 $('kiosk-app-id-edit').focus();
53 }, 55 },
54 56
55 /** 57 /**
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 }; 120 };
119 121
120 // Export 122 // Export
121 return { 123 return {
122 KioskAppsOverlay: KioskAppsOverlay 124 KioskAppsOverlay: KioskAppsOverlay
123 }; 125 };
124 }); 126 });
125 127
126 <include src="kiosk_app_list.js"></include> 128 <include src="kiosk_app_list.js"></include>
127 <include src="kiosk_app_disable_bailout_confirm.js"></include> 129 <include src="kiosk_app_disable_bailout_confirm.js"></include>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698