| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 /** | 5 /** |
| 6 * @fileoverview A helper object used from the the People section to get the | 6 * @fileoverview A helper object used from the the People section to get the |
| 7 * status of the sync backend and user preferences on what data to sync. Used | 7 * status of the sync backend and user preferences on what data to sync. Used |
| 8 * for both Chrome browser and ChromeOS. | 8 * for both Chrome browser and ChromeOS. |
| 9 */ | 9 */ |
| 10 cr.exportPath('settings'); | 10 cr.exportPath('settings'); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 */ | 28 */ |
| 29 settings.SyncStatus; | 29 settings.SyncStatus; |
| 30 | 30 |
| 31 | 31 |
| 32 /** | 32 /** |
| 33 * Must be kept in sync with the return values of getSyncErrorAction in | 33 * Must be kept in sync with the return values of getSyncErrorAction in |
| 34 * chrome/browser/ui/webui/settings/people_handler.cc | 34 * chrome/browser/ui/webui/settings/people_handler.cc |
| 35 * @enum {string} | 35 * @enum {string} |
| 36 */ | 36 */ |
| 37 settings.StatusAction = { | 37 settings.StatusAction = { |
| 38 NO_ACTION: 'noAction', // No action to take. | 38 NO_ACTION: 'noAction', // No action to take. |
| 39 REAUTHENTICATE: 'reauthenticate', // User needs to reauthenticate. | 39 REAUTHENTICATE: 'reauthenticate', // User needs to reauthenticate. |
| 40 SIGNOUT_AND_SIGNIN: 'signOutAndSignIn', // User needs to sign out and sign in. | 40 SIGNOUT_AND_SIGNIN: |
| 41 UPGRADE_CLIENT: 'upgradeClient', // User needs to upgrade the client. | 41 'signOutAndSignIn', // User needs to sign out and sign in. |
| 42 ENTER_PASSPHRASE: 'enterPassphrase', // User needs to enter passphrase. | 42 UPGRADE_CLIENT: 'upgradeClient', // User needs to upgrade the client. |
| 43 ENTER_PASSPHRASE: 'enterPassphrase', // User needs to enter passphrase. |
| 44 CONFIRM_SYNC_SETTINGS: |
| 45 'confirmSyncSettings', // User needs to confirm sync settings. |
| 43 }; | 46 }; |
| 44 | 47 |
| 45 /** | 48 /** |
| 46 * The state of sync. This is the data structure sent back and forth between | 49 * The state of sync. This is the data structure sent back and forth between |
| 47 * C++ and JS. Its naming and structure is not optimal, but changing it would | 50 * C++ and JS. Its naming and structure is not optimal, but changing it would |
| 48 * require changes to the C++ handler, which is already functional. | 51 * require changes to the C++ handler, which is already functional. |
| 49 * @typedef {{ | 52 * @typedef {{ |
| 50 * appsEnforced: boolean, | 53 * appsEnforced: boolean, |
| 51 * appsRegistered: boolean, | 54 * appsRegistered: boolean, |
| 52 * appsSynced: boolean, | 55 * appsSynced: boolean, |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 chrome.metricsPrivate.recordUserAction( | 236 chrome.metricsPrivate.recordUserAction( |
| 234 'Signin_AccountSettings_GoogleActivityControlsClicked'); | 237 'Signin_AccountSettings_GoogleActivityControlsClicked'); |
| 235 } | 238 } |
| 236 }; | 239 }; |
| 237 | 240 |
| 238 return { | 241 return { |
| 239 SyncBrowserProxy: SyncBrowserProxy, | 242 SyncBrowserProxy: SyncBrowserProxy, |
| 240 SyncBrowserProxyImpl: SyncBrowserProxyImpl, | 243 SyncBrowserProxyImpl: SyncBrowserProxyImpl, |
| 241 }; | 244 }; |
| 242 }); | 245 }); |
| OLD | NEW |