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

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

Issue 2302453002: ChromeOS: Fix "continue OOBE on restart" screen size calculation. (Closed)
Patch Set: Update after review Created 4 years, 3 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
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_network.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 this.context.set(CONTEXT_KEY_INPUT_METHOD, inputMethodId); 90 this.context.set(CONTEXT_KEY_INPUT_METHOD, inputMethodId);
91 this.commitContextChanges(); 91 this.commitContextChanges();
92 }, 92 },
93 93
94 onTimezoneSelected_: function(timezoneId) { 94 onTimezoneSelected_: function(timezoneId) {
95 this.context.set(CONTEXT_KEY_TIMEZONE, timezoneId); 95 this.context.set(CONTEXT_KEY_TIMEZONE, timezoneId);
96 this.commitContextChanges(); 96 this.commitContextChanges();
97 }, 97 },
98 98
99 onBeforeShow: function(data) { 99 onBeforeShow: function(data) {
100 this.setMDMode_();
100 cr.ui.DropDown.show('networks-list', true, -1); 101 cr.ui.DropDown.show('networks-list', true, -1);
101 this.classList.toggle('connect-debugging-view', 102 this.classList.toggle('connect-debugging-view',
102 data && 'isDeveloperMode' in data && data['isDeveloperMode']); 103 data && 'isDeveloperMode' in data && data['isDeveloperMode']);
103 }, 104 },
104 105
105 onBeforeHide: function() { 106 onBeforeHide: function() {
106 cr.ui.DropDown.hide('networks-list'); 107 cr.ui.DropDown.hide('networks-list');
107 }, 108 },
108 109
109 /** 110 /**
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 var error = document.createElement('div'); 149 var error = document.createElement('div');
149 var messageDiv = document.createElement('div'); 150 var messageDiv = document.createElement('div');
150 messageDiv.className = 'error-message-bubble'; 151 messageDiv.className = 'error-message-bubble';
151 messageDiv.textContent = message; 152 messageDiv.textContent = message;
152 error.appendChild(messageDiv); 153 error.appendChild(messageDiv);
153 error.setAttribute('role', 'alert'); 154 error.setAttribute('role', 'alert');
154 155
155 $('bubble').showContentForElement($('networks-list'), 156 $('bubble').showContentForElement($('networks-list'),
156 cr.ui.Bubble.Attachment.BOTTOM, 157 cr.ui.Bubble.Attachment.BOTTOM,
157 error); 158 error);
158 } 159 },
160
161 /**
162 * This is called after resources are updated.
163 */
164 updateLocalizedContent: function() {
165 this.setMDMode_();
166 },
167
168 /**
169 * This method takes care of switching to material-design OOBE.
170 * @private
171 */
172 setMDMode_: function() {
173 var useMDOobe = (loadTimeData.getString('newOobeUI') == 'on');
174
175 $('oobe-connect').hidden = useMDOobe;
176 $('oobe-welcome-md').hidden = !useMDOobe;
177
178 if (useMDOobe) {
179 var welcomeScreen = $('oobe-welcome-md');
180 var languageList = loadTimeData.getValue('languageList');
181 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList);
182 welcomeScreen.languages = languageList;
183
184 welcomeScreen.keyboards = loadTimeData.getValue('inputMethodsList');
185 welcomeScreen.enabled = true;
186 }
187 },
159 }; 188 };
160 }); 189 });
161 190
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_network.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698