| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 cr.define('options', function() { | 5 cr.define('options', function() { |
| 6 var Page = cr.ui.pageManager.Page; | 6 var Page = cr.ui.pageManager.Page; |
| 7 var PageManager = cr.ui.pageManager.PageManager; | 7 var PageManager = cr.ui.pageManager.PageManager; |
| 8 var ArrayDataModel = cr.ui.ArrayDataModel; | 8 var ArrayDataModel = cr.ui.ArrayDataModel; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 }; | 88 }; |
| 89 | 89 |
| 90 $('create-profile-supervised-signed-in-learn-more-link').onclick = | 90 $('create-profile-supervised-signed-in-learn-more-link').onclick = |
| 91 function(event) { | 91 function(event) { |
| 92 PageManager.showPageByName('supervisedUserLearnMore'); | 92 PageManager.showPageByName('supervisedUserLearnMore'); |
| 93 return false; | 93 return false; |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 $('create-profile-supervised-sign-in-link').onclick = | 96 $('create-profile-supervised-sign-in-link').onclick = |
| 97 function(event) { | 97 function(event) { |
| 98 // Without the new avatar menu, the signin process will open an overlay | |
| 99 // to configure sync, which would replace this overlay. It's smoother to | |
| 100 // close this one now. | |
| 101 // With the new avatar menu enabled, a sign-in flow in the avatar menu | |
| 102 // is triggered instead, which does not open any overlays, so there's no | |
| 103 // need to close this one. | |
| 104 if (!loadTimeData.getBoolean('newAvatarMenuEnabled')) { | |
| 105 // TODO(pamg): Move the sync-setup overlay to a higher layer so this | |
| 106 // one can stay open under it, after making sure that doesn't break | |
| 107 // anything else. | |
| 108 PageManager.closeOverlay(); | |
| 109 } | |
| 110 SyncSetupOverlay.startSignIn(); | 98 SyncSetupOverlay.startSignIn(); |
| 111 }; | 99 }; |
| 112 | 100 |
| 113 $('create-profile-supervised-sign-in-again-link').onclick = | 101 $('create-profile-supervised-sign-in-again-link').onclick = |
| 114 function(event) { | 102 function(event) { |
| 115 if (!loadTimeData.getBoolean('newAvatarMenuEnabled')) | |
| 116 PageManager.closeOverlay(); | |
| 117 SyncSetupOverlay.showSetupUI(); | 103 SyncSetupOverlay.showSetupUI(); |
| 118 }; | 104 }; |
| 119 | 105 |
| 120 $('import-existing-supervised-user-link').onclick = function(event) { | 106 $('import-existing-supervised-user-link').onclick = function(event) { |
| 121 // Hide the import button to trigger a cursor update. The import button | 107 // Hide the import button to trigger a cursor update. The import button |
| 122 // is shown again when the import overlay loads. TODO(akuegel): Remove | 108 // is shown again when the import overlay loads. TODO(akuegel): Remove |
| 123 // this temporary fix when crbug/246304 is resolved. | 109 // this temporary fix when crbug/246304 is resolved. |
| 124 $('import-existing-supervised-user-link').hidden = true; | 110 $('import-existing-supervised-user-link').hidden = true; |
| 125 PageManager.showPageByName('supervisedUserImport'); | 111 PageManager.showPageByName('supervisedUserImport'); |
| 126 }; | 112 }; |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 'updateSignedInStatus', | 861 'updateSignedInStatus', |
| 876 'updateSupervisedUsersAllowed', | 862 'updateSupervisedUsersAllowed', |
| 877 ]); | 863 ]); |
| 878 | 864 |
| 879 // Export | 865 // Export |
| 880 return { | 866 return { |
| 881 ManageProfileOverlay: ManageProfileOverlay, | 867 ManageProfileOverlay: ManageProfileOverlay, |
| 882 CreateProfileOverlay: CreateProfileOverlay, | 868 CreateProfileOverlay: CreateProfileOverlay, |
| 883 }; | 869 }; |
| 884 }); | 870 }); |
| OLD | NEW |