| Index: chrome/browser/resources/settings/people_page/sync_browser_proxy.js
|
| diff --git a/chrome/browser/resources/settings/people_page/sync_browser_proxy.js b/chrome/browser/resources/settings/people_page/sync_browser_proxy.js
|
| index 69b304c603e45acc7a4a78cadbf1db74ea0d09b0..f71f2ad056867509324e3e6d6bbfe695307a0a5f 100644
|
| --- a/chrome/browser/resources/settings/people_page/sync_browser_proxy.js
|
| +++ b/chrome/browser/resources/settings/people_page/sync_browser_proxy.js
|
| @@ -10,8 +10,7 @@
|
| cr.exportPath('settings');
|
|
|
| /**
|
| - * @typedef {{actionLinkText: (string|undefined),
|
| - * childUser: (boolean|undefined),
|
| + * @typedef {{childUser: (boolean|undefined),
|
| * domain: (string|undefined),
|
| * hasError: (boolean|undefined),
|
| * hasUnrecoverableError: (boolean|undefined),
|
| @@ -21,6 +20,7 @@ cr.exportPath('settings');
|
| * signedIn: (boolean|undefined),
|
| * signedInUsername: (string|undefined),
|
| * signinAllowed: (boolean|undefined),
|
| + * statusAction: (!settings.StatusAction),
|
| * statusText: (string|undefined),
|
| * supervisedUser: (boolean|undefined),
|
| * syncSystemEnabled: (boolean|undefined)}}
|
| @@ -28,6 +28,19 @@ cr.exportPath('settings');
|
| */
|
| settings.SyncStatus;
|
|
|
| +
|
| +/**
|
| + * Must be kept in sync with the return values of getSyncErrorAction in
|
| + * chrome/browser/ui/webui/settings/people_handler.cc
|
| + * @enum {string}
|
| + */
|
| +settings.StatusAction = {
|
| + NO_ACTION: 'noAction', // No action to take.
|
| + REAUTHENTICATE: 'reauthenticate', // User needs to reauthenticate.
|
| + UPGRADE_CLIENT: 'upgradeClient', // User needs to upgrade the client.
|
| + ENTER_PASSPHRASE: 'enterPassphrase', // User needs to enter passphrase.
|
| +};
|
| +
|
| /**
|
| * The state of sync. This is the data structure sent back and forth between
|
| * C++ and JS. Its naming and structure is not optimal, but changing it would
|
| @@ -110,6 +123,13 @@ cr.define('settings', function() {
|
| manageOtherPeople: function() {},
|
| </if>
|
|
|
| +<if expr="chromeos">
|
| + /**
|
| + * Signs the user out.
|
| + */
|
| + attemptUserExit: function() {},
|
| +</if>
|
| +
|
| /**
|
| * Gets the current sync status.
|
| * @return {!Promise<!settings.SyncStatus>}
|
| @@ -176,6 +196,12 @@ cr.define('settings', function() {
|
| chrome.send('SyncSetupManageOtherPeople');
|
| },
|
| </if>
|
| +<if expr="chromeos">
|
| + /** @override */
|
| + attemptUserExit: function() {
|
| + return chrome.send('AttemptUserExit');
|
| + },
|
| +</if>
|
|
|
| /** @override */
|
| getSyncStatus: function() {
|
|
|