chrome/browser/resources/options/chromeos/consumer_management_overlay.js - Issue 493613002: Add an enrolling state for consumer management section in settings page.

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/options/chromeos/consumer_management_overlay.js

Issue 493613002: Add an enrolling state for consumer management section in settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dn

Patch Set: Fixed the unit test. Created 6 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/options/browser_options.js ('K') | « chrome/browser/resources/options/chromeos/consumer_management_overlay.html ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/chromeos/consumer_management_overlay.js

diff --git a/chrome/browser/resources/options/chromeos/consumer_management_overlay.js b/chrome/browser/resources/options/chromeos/consumer_management_overlay.js

index d2a85372db62399ef0191d9305a1442c0d5e86b0..34e29d8c8ec925e7f4c87f90b7bc586a656491a5 100644

--- a/chrome/browser/resources/options/chromeos/consumer_management_overlay.js

+++ b/chrome/browser/resources/options/chromeos/consumer_management_overlay.js

@@ -17,10 +17,6 @@ cr.define('options', function() {

loadTimeData.getString('consumerManagementOverlayTabTitle'),

'consumer-management-overlay');

- var isEnrolled = loadTimeData.getBoolean('consumerManagementEnrolled');

- $('enroll-content').hidden = isEnrolled;

- $('unenroll-content').hidden = !isEnrolled;

$('consumer-management-overlay-enroll').onclick = function(event) {

chrome.send('enrollConsumerManagement');

PageManager.closeOverlay();

@@ -43,6 +39,17 @@ cr.define('options', function() {

__proto__: Page.prototype,

};

+ /**

+ * Shows enrollment or unenrollment content based on the status.

+ * @param {string} status Consumer management service status string.

Dan Beam 2014/09/04 23:12:37 can this be an enum?

davidyu 2014/09/05 06:14:11 Done.

+ */

+ ConsumerManagementOverlay.setStatus = function(status) {

+ // Status should only be enrolled, or unenrolled.

Dan Beam 2014/09/04 23:12:37 assert(status == 'StatusEnrolled' || status == 'St

Dan Beam 2014/09/04 23:12:37 s/,//

davidyu 2014/09/05 06:14:11 Done.

+ var enrolled = status == 'StatusEnrolled';

+ $('enroll-content').hidden = enrolled;

+ $('unenroll-content').hidden = !enrolled;

+ };

// Export

return {

ConsumerManagementOverlay: ConsumerManagementOverlay