chrome/browser/resources/chromeos/login/oobe.js - Issue 2247723002: ChromeOS: Implement EULA 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 2247723002: ChromeOS: Implement EULA 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/login/custom_elements_oobe.js ('k') | chrome/browser/resources/chromeos/login/oobe_card.html » ('j') | no next file with comments »
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 84dd96b27050eb66d17bc358f6c9dfef8048376d..80713fbbe0d3895dbd0e93a779caf626b79b4c00 100644

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

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

@@ -306,8 +306,9 @@ cr.define('cr.ui.Oobe', function() {

Oobe.setupSelect($('keyboard-select'), data.inputMethodsList);

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

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

+ // ---------- MD OOBE screen

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

+ // Welcome + etc...

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

welcomeScreen.currentLanguage =

Oobe.getSelectedTitle(data.languageList);

@@ -318,6 +319,10 @@ cr.define('cr.ui.Oobe', function() {

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

welcomeScreen.hidden = false;

welcomeScreen.enabled = true;

+ // EULA

+ $('oobe-poly-eula').hidden = false;

+ $('oobe-eula').hidden = true;

+ $('oobe').setAttribute('md-mode', 'true');

} else {

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

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

@@ -335,6 +340,6 @@ cr.define('cr.ui.Oobe', function() {

updateLocalizedContent: function() {

// Buttons, headers and links.

Oobe.getInstance().updateLocalizedContent_();

- }

+ },

};

});