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

Unified Diff: chrome/browser/resources/options/managed_user_create_confirm.js

Issue 125993002: Add error handling for supervised user import flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move ManagedUserListData to its own file. Created 6 years, 11 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
Index: chrome/browser/resources/options/managed_user_create_confirm.js
diff --git a/chrome/browser/resources/options/managed_user_create_confirm.js b/chrome/browser/resources/options/managed_user_create_confirm.js
index de91bf9be9d65c7a533b0f0d45e642b96f0d435a..84bce024659d0ef66a915c3b7a319449d647b78f 100644
--- a/chrome/browser/resources/options/managed_user_create_confirm.js
+++ b/chrome/browser/resources/options/managed_user_create_confirm.js
@@ -64,23 +64,9 @@ cr.define('options', function() {
* @private
*/
setProfileInfo_: function(info) {
- function HTMLEscape(original) {
- return original.replace(/&/g, '&')
- .replace(/</g, '&lt;')
- .replace(/>/g, '&gt;')
- .replace(/"/g, '&quot;')
- .replace(/'/g, '&#39;');
- }
-
- var MAX_LENGTH = 50;
- function elide(original) {
- if (original.length <= MAX_LENGTH)
- return original;
- return original.substring(0, MAX_LENGTH - 3) + '...';
- }
-
this.profileInfo_ = info;
- var elidedName = elide(info.name);
+ var MAX_LENGTH = 50;
+ var elidedName = elide(info.name, MAX_LENGTH);
$('managed-user-created-title').textContent =
loadTimeData.getStringF('managedUserCreatedTitle', elidedName);
$('managed-user-created-switch').textContent =
@@ -92,7 +78,8 @@ cr.define('options', function() {
$('managed-user-created-text').innerHTML =
loadTimeData.getStringF('managedUserCreatedText',
HTMLEscape(elidedName),
- HTMLEscape(elide(info.custodianEmail)));
+ HTMLEscape(elide(info.custodianEmail,
+ MAX_LENGTH)));
},
/** @override */

Powered by Google App Engine
This is Rietveld 408576698