Index: chrome/browser/resources/options/manage_profile_overlay.js |
diff --git a/chrome/browser/resources/options/manage_profile_overlay.js b/chrome/browser/resources/options/manage_profile_overlay.js |
index 19e4b577da7ac6ddff8cb180c38949dc9c04289b..8fa78e3afadb63e94e13fc124436771f1b7c333c 100644 |
--- a/chrome/browser/resources/options/manage_profile_overlay.js |
+++ b/chrome/browser/resources/options/manage_profile_overlay.js |
@@ -335,7 +335,6 @@ cr.define('options', function() { |
updateCreateOrImport_: function(mode) { |
// In 'create' mode, check for existing managed users with the same name. |
if (mode == 'create' && |
- !loadTimeData.getBoolean('disableCreateExistingManagedUsers') && |
$('create-profile-managed').checked) { |
Pam (message me for reviews)
2014/04/11 13:54:16
Can this line be moved up?
Adrian Kuegel
2014/04/11 14:04:56
Yes, definitely. Thanks for catching this. Done.
|
options.ManagedUserListData.requestExistingManagedUsers().then( |
this.receiveExistingManagedUsers_.bind(this), |
@@ -639,11 +638,9 @@ cr.define('options', function() { |
$('create-profile-managed').checked = false; |
$('import-existing-managed-user-link').hidden = true; |
- if (!loadTimeData.getBoolean('disableCreateExistingManagedUsers')) { |
- $('create-profile-managed').onchange = function() { |
- ManageProfileOverlay.getInstance().updateCreateOrImport_('create'); |
- }; |
- } |
+ $('create-profile-managed').onchange = function() { |
+ ManageProfileOverlay.getInstance().updateCreateOrImport_('create'); |
+ }; |
$('create-profile-managed-signed-in').disabled = true; |
$('create-profile-managed-signed-in').hidden = true; |
$('create-profile-managed-not-signed-in').hidden = true; |
@@ -791,9 +788,6 @@ cr.define('options', function() { |
* @private |
*/ |
updateImportExistingManagedUserLink_: function(enable) { |
- if (loadTimeData.getBoolean('disableCreateExistingManagedUsers')) |
- return; |
- |
var importManagedUserElement = $('import-existing-managed-user-link'); |
importManagedUserElement.hidden = false; |
importManagedUserElement.disabled = !enable || this.createInProgress_; |