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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 function(event) { | 110 function(event) { |
111 PageManager.closeOverlay(); | 111 PageManager.closeOverlay(); |
112 SyncSetupOverlay.showSetupUI(); | 112 SyncSetupOverlay.showSetupUI(); |
113 }; | 113 }; |
114 | 114 |
115 $('import-existing-supervised-user-link').onclick = function(event) { | 115 $('import-existing-supervised-user-link').onclick = function(event) { |
116 // Hide the import button to trigger a cursor update. The import button | 116 // Hide the import button to trigger a cursor update. The import button |
117 // is shown again when the import overlay loads. TODO(akuegel): Remove | 117 // is shown again when the import overlay loads. TODO(akuegel): Remove |
118 // this temporary fix when crbug/246304 is resolved. | 118 // this temporary fix when crbug/246304 is resolved. |
119 $('import-existing-supervised-user-link').hidden = true; | 119 $('import-existing-supervised-user-link').hidden = true; |
120 PageManager.showPageByName('managedUserImport'); | 120 PageManager.showPageByName('supervisedUserImport'); |
michaelpg
2014/08/01 17:07:54
https://codereview.chromium.org/431303003/
Dan Beam
2014/08/01 17:13:16
Done.
| |
121 }; | 121 }; |
122 }, | 122 }, |
123 | 123 |
124 /** @override */ | 124 /** @override */ |
125 didShowPage: function() { | 125 didShowPage: function() { |
126 chrome.send('requestDefaultProfileIcons', ['manage']); | 126 chrome.send('requestDefaultProfileIcons', ['manage']); |
127 | 127 |
128 // Just ignore the manage profile dialog on Chrome OS, they use /accounts. | 128 // Just ignore the manage profile dialog on Chrome OS, they use /accounts. |
129 if (!cr.isChromeOS && window.location.pathname == '/manageProfile') | 129 if (!cr.isChromeOS && window.location.pathname == '/manageProfile') |
130 ManageProfileOverlay.getInstance().prepareForManageDialog_(); | 130 ManageProfileOverlay.getInstance().prepareForManageDialog_(); |
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
858 return instance[name + '_'].apply(instance, arguments); | 858 return instance[name + '_'].apply(instance, arguments); |
859 }; | 859 }; |
860 }); | 860 }); |
861 | 861 |
862 // Export | 862 // Export |
863 return { | 863 return { |
864 ManageProfileOverlay: ManageProfileOverlay, | 864 ManageProfileOverlay: ManageProfileOverlay, |
865 CreateProfileOverlay: CreateProfileOverlay, | 865 CreateProfileOverlay: CreateProfileOverlay, |
866 }; | 866 }; |
867 }); | 867 }); |
OLD | NEW |