chrome/browser/resources/chromeos/login/oobe.js - Issue 2189733006: ChromeOS: Implement Language Selection screen of material design OOBE.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/chromeos/login/oobe.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, 5 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/chromeos/login/custom_elements_oobe.js ('K') | « chrome/browser/resources/chromeos/login/custom_elements_oobe.js ('k') | chrome/browser/resources/chromeos/login/oobe_buttons.html » ('j') | chrome/browser/resources/chromeos/login/oobe_i18n_dropdown.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/login/oobe.js

diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js

index 729a695c31f9ce777e6f29f5290f2413d3636358..cf4ee4944843a0baaeb2a6d8cd2e5dc22f35a0ec 100644

--- a/chrome/browser/resources/chromeos/login/oobe.js

+++ b/chrome/browser/resources/chromeos/login/oobe.js

@@ -305,12 +305,16 @@ cr.define('cr.ui.Oobe', function() {

Oobe.setupSelect($('timezone-select'), data.timezoneList);

// ---------- Welcome screen

- $('oobe-welcome-md').currentLanguage =

- Oobe.getSelectedTitle(data.languageList);

if (data.newOobeUI == 'on') {

+ var welcomeScreen = $('oobe-welcome-md');

+ welcomeScreen.currentLanguage =

+ Oobe.getSelectedTitle(data.languageList);

+ welcomeScreen.languages = data.languageList;

+ welcomeScreen.keyboards = data.inputMethodsList;

$('oobe-connect').hidden = true;

- $('oobe-welcome-md').hidden = false;

+ welcomeScreen.hidden = false;

} else {

$('oobe-connect').hidden = false;

$('oobe-welcome-md').hidden = true;