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.exportPath('options'); | 5 cr.exportPath('options'); |
6 | 6 |
7 /** | 7 /** |
8 * @typedef {{actionLinkText: (string|undefined), | 8 * @typedef {{actionLinkText: (string|undefined), |
9 * childUser: (boolean|undefined), | 9 * childUser: (boolean|undefined), |
10 * hasError: (boolean|undefined), | 10 * hasError: (boolean|undefined), |
(...skipping 2301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2312 break; | 2312 break; |
2313 case ConsumerManagementOverlay.Status.STATUS_UNENROLLING: | 2313 case ConsumerManagementOverlay.Status.STATUS_UNENROLLING: |
2314 strId = 'consumerManagementUnenrollingButton'; | 2314 strId = 'consumerManagementUnenrollingButton'; |
2315 button.disabled = true; | 2315 button.disabled = true; |
2316 break; | 2316 break; |
2317 } | 2317 } |
2318 button.textContent = loadTimeData.getString(strId); | 2318 button.textContent = loadTimeData.getString(strId); |
2319 }; | 2319 }; |
2320 | 2320 |
2321 /** | 2321 /** |
2322 * Hides Android Apps settings when they are not available (ChromeOS only). | 2322 * Hides Android Apps settings when they are not available. |
2323 * Disables Android Apps checkbox for managed profiles. (ChromeOS only) | |
bartfab (slow)
2016/02/16 15:23:00
Nit 1: s/profiles/users/
Nit 2: s/ChromeOS/Chrome
Polina Bondarenko
2016/02/25 15:28:30
Removed my changes, it works without explicit disa
bartfab (slow)
2016/03/02 14:45:40
What do you mean by "after reboot" - do you need t
| |
2323 */ | 2324 */ |
2324 BrowserOptions.hideAndroidAppsSection = function() { | 2325 BrowserOptions.setAndroidAppsSectionAttributes = function(hidden, managed) { |
2325 var section = $('andorid-apps-section'); | 2326 var section = $('android-apps-section'); |
2326 if (section) | 2327 if (section) { |
2327 section.hidden = true; | 2328 section.hidden = hidden; |
2329 section.disabled = managed; | |
bartfab (slow)
2016/02/16 15:23:00
The check box should disable itself when the pref
Polina Bondarenko
2016/02/25 15:28:30
Done.
| |
2330 } | |
2328 }; | 2331 }; |
2329 } | 2332 } |
2330 | 2333 |
2331 // Export | 2334 // Export |
2332 return { | 2335 return { |
2333 BrowserOptions: BrowserOptions | 2336 BrowserOptions: BrowserOptions |
2334 }; | 2337 }; |
2335 }); | 2338 }); |
OLD | NEW |