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

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_screen_network.js

Issue 2189733006: ChromeOS: Implement Language Selection screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 4 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 /** 5 /**
6 * @fileoverview Oobe network screen implementation. 6 * @fileoverview Oobe network screen implementation.
7 */ 7 */
8 8
9 login.createScreen('NetworkScreen', 'connect', function() { 9 login.createScreen('NetworkScreen', 'connect', function() {
10 var USER_ACTION_CONTINUE_BUTTON_CLICKED = 'continue'; 10 var USER_ACTION_CONTINUE_BUTTON_CLICKED = 'continue';
(...skipping 13 matching lines...) Expand all
24 * Dropdown element for networks selection. 24 * Dropdown element for networks selection.
25 */ 25 */
26 dropdown_: null, 26 dropdown_: null,
27 27
28 /** @override */ 28 /** @override */
29 decorate: function() { 29 decorate: function() {
30 var self = this; 30 var self = this;
31 31
32 Oobe.setupSelect($('language-select'), 32 Oobe.setupSelect($('language-select'),
33 loadTimeData.getValue('languageList'), 33 loadTimeData.getValue('languageList'),
34 function(languageId) { 34 function(languageId) {
michaelpg 2016/08/02 00:06:38 optional: this.onLanguageSelected_.bind(this)
Alexander Alekseev 2016/08/02 04:25:57 Done.
35 self.context.set(CONTEXT_KEY_LOCALE, languageId); 35 self.onLanguageSelected_(languageId);
36 self.commitContextChanges();
37 }); 36 });
38 Oobe.setupSelect($('keyboard-select'), 37 Oobe.setupSelect($('keyboard-select'),
39 loadTimeData.getValue('inputMethodsList'), 38 loadTimeData.getValue('inputMethodsList'),
40 function(inputMethodId) { 39 function(inputMethodId) {
41 self.context.set(CONTEXT_KEY_INPUT_METHOD, 40 self.onKeyboardSelected_(inputMethodId);
michaelpg 2016/08/02 00:06:38 same
Alexander Alekseev 2016/08/02 04:25:57 Done.
42 inputMethodId);
43 self.commitContextChanges();
44 }); 41 });
45 Oobe.setupSelect($('timezone-select'), 42 Oobe.setupSelect($('timezone-select'),
46 loadTimeData.getValue('timezoneList'), 43 loadTimeData.getValue('timezoneList'),
47 function(timezoneId) { 44 function(timezoneId) {
michaelpg 2016/08/02 00:06:38 same
Alexander Alekseev 2016/08/02 04:25:57 Done.
48 self.context.set(CONTEXT_KEY_TIMEZONE, timezoneId); 45 self.onTimezoneSelected_(timezoneId);
49 self.commitContextChanges();
50 }); 46 });
51 47
48 // ---------- Welcome screen
49 var welcomeScreen = $('oobe-welcome-md');
50 welcomeScreen.screen = this;
51
52 var languageList = loadTimeData.getValue('languageList');
53 welcomeScreen.languages = languageList;
54 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList);
55
56 var inputMethodsList = loadTimeData.getValue('inputMethodsList');
57 welcomeScreen.keyboards = inputMethodsList;
58 // -------------------------
59
52 this.dropdown_ = $('networks-list'); 60 this.dropdown_ = $('networks-list');
53 cr.ui.DropDown.decorate(this.dropdown_); 61 cr.ui.DropDown.decorate(this.dropdown_);
54 62
55 this.declareUserAction( 63 this.declareUserAction(
56 $('connect-debugging-features-link'), 64 $('connect-debugging-features-link'),
57 { action_id: USER_ACTION_CONNECT_DEBUGGING_FEATURES_CLICKED, 65 { action_id: USER_ACTION_CONNECT_DEBUGGING_FEATURES_CLICKED,
58 event: 'click' 66 event: 'click'
59 }); 67 });
60 this.declareUserAction( 68 this.declareUserAction(
61 $('connect-debugging-features-link'), 69 $('connect-debugging-features-link'),
(...skipping 12 matching lines...) Expand all
74 }); 82 });
75 this.context.addObserver(CONTEXT_KEY_TIMEZONE, function(timezoneId) { 83 this.context.addObserver(CONTEXT_KEY_TIMEZONE, function(timezoneId) {
76 $('timezone-select').value = timezoneId; 84 $('timezone-select').value = timezoneId;
77 }); 85 });
78 this.context.addObserver(CONTEXT_KEY_CONTINUE_BUTTON_ENABLED, 86 this.context.addObserver(CONTEXT_KEY_CONTINUE_BUTTON_ENABLED,
79 function(enabled) { 87 function(enabled) {
80 $('continue-button').disabled = !enabled; 88 $('continue-button').disabled = !enabled;
81 }); 89 });
82 }, 90 },
83 91
92 onLanguageSelected_: function(languageId) {
93 this.context.set(CONTEXT_KEY_LOCALE, languageId);
94 this.commitContextChanges();
95 },
96
97 onKeyboardSelected_: function(inputMethodId) {
98 this.context.set(CONTEXT_KEY_INPUT_METHOD, inputMethodId);
99 this.commitContextChanges();
100 },
101
102 onTimezoneSelected_: function(timezoneId) {
103 this.context.set(CONTEXT_KEY_TIMEZONE, timezoneId);
104 this.commitContextChanges();
105 },
106
84 onBeforeShow: function(data) { 107 onBeforeShow: function(data) {
85 cr.ui.DropDown.show('networks-list', true, -1); 108 cr.ui.DropDown.show('networks-list', true, -1);
86 this.classList.toggle('connect-debugging-view', 109 this.classList.toggle('connect-debugging-view',
87 data && 'isDeveloperMode' in data && data['isDeveloperMode']); 110 data && 'isDeveloperMode' in data && data['isDeveloperMode']);
88 }, 111 },
89 112
90 onBeforeHide: function() { 113 onBeforeHide: function() {
91 cr.ui.DropDown.hide('networks-list'); 114 cr.ui.DropDown.hide('networks-list');
92 }, 115 },
93 116
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 error.appendChild(messageDiv); 160 error.appendChild(messageDiv);
138 error.setAttribute('role', 'alert'); 161 error.setAttribute('role', 'alert');
139 162
140 $('bubble').showContentForElement($('networks-list'), 163 $('bubble').showContentForElement($('networks-list'),
141 cr.ui.Bubble.Attachment.BOTTOM, 164 cr.ui.Bubble.Attachment.BOTTOM,
142 error); 165 error);
143 } 166 }
144 }; 167 };
145 }); 168 });
146 169
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698