| 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 /** @typedef {{appsEnforced: boolean, | 7 /** @typedef {{appsEnforced: boolean, |
| 8 * appsRegistered: boolean, | 8 * appsRegistered: boolean, |
| 9 * appsSynced: boolean, | 9 * appsSynced: boolean, |
| 10 * autofillEnforced: boolean, | 10 * autofillEnforced: boolean, |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 }, | 269 }, |
| 270 | 270 |
| 271 sendConfiguration_: function() { | 271 sendConfiguration_: function() { |
| 272 var encryptAllData = $('full-encryption-option').checked; | 272 var encryptAllData = $('full-encryption-option').checked; |
| 273 | 273 |
| 274 var usePassphrase; | 274 var usePassphrase; |
| 275 var customPassphrase; | 275 var customPassphrase; |
| 276 var googlePassphrase = false; | 276 var googlePassphrase = false; |
| 277 if (!$('sync-existing-passphrase-container').hidden) { | 277 if (!$('sync-existing-passphrase-container').hidden) { |
| 278 // If we were prompted for an existing passphrase, use it. | 278 // If we were prompted for an existing passphrase, use it. |
| 279 customPassphrase = $('choose-data-types-form').passphrase.value; | 279 customPassphrase = |
| 280 $('choose-data-types-form').querySelector('#passphrase').value; |
| 280 usePassphrase = true; | 281 usePassphrase = true; |
| 281 // If we were displaying the 'enter your old google password' prompt, | 282 // If we were displaying the 'enter your old google password' prompt, |
| 282 // then that means this is the user's google password. | 283 // then that means this is the user's google password. |
| 283 googlePassphrase = !$('google-passphrase-needed-body').hidden; | 284 googlePassphrase = !$('google-passphrase-needed-body').hidden; |
| 284 // We allow an empty passphrase, in case the user has disabled | 285 // We allow an empty passphrase, in case the user has disabled |
| 285 // all their encrypted datatypes. In that case, the PSS will accept | 286 // all their encrypted datatypes. In that case, the PSS will accept |
| 286 // the passphrase and finish configuration. If the user has enabled | 287 // the passphrase and finish configuration. If the user has enabled |
| 287 // encrypted datatypes, the PSS will prompt again specifying that the | 288 // encrypted datatypes, the PSS will prompt again specifying that the |
| 288 // passphrase failed. | 289 // passphrase failed. |
| 289 } else if (!$('basic-encryption-option').disabled && | 290 } else if (!$('basic-encryption-option').disabled && |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 | 868 |
| 868 SyncSetupOverlay.showStopSyncingUI = function() { | 869 SyncSetupOverlay.showStopSyncingUI = function() { |
| 869 SyncSetupOverlay.getInstance().showStopSyncingUI_(); | 870 SyncSetupOverlay.getInstance().showStopSyncingUI_(); |
| 870 }; | 871 }; |
| 871 | 872 |
| 872 // Export | 873 // Export |
| 873 return { | 874 return { |
| 874 SyncSetupOverlay: SyncSetupOverlay | 875 SyncSetupOverlay: SyncSetupOverlay |
| 875 }; | 876 }; |
| 876 }); | 877 }); |
| OLD | NEW |