| 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 be5c2b6d98523f5b192877738054ea7951f7bd11..59e20e22abd3881fe9db9ae825caf1d541c0e510 100644
|
| --- a/chrome/browser/resources/settings/people_page/sync_browser_proxy.js
|
| +++ b/chrome/browser/resources/settings/people_page/sync_browser_proxy.js
|
| @@ -35,11 +35,12 @@ settings.SyncStatus;
|
| * @enum {string}
|
| */
|
| settings.StatusAction = {
|
| - NO_ACTION: 'noAction', // No action to take.
|
| - REAUTHENTICATE: 'reauthenticate', // User needs to reauthenticate.
|
| - SIGNOUT_AND_SIGNIN: 'signOutAndSignIn', // User needs to sign out and sign in.
|
| - UPGRADE_CLIENT: 'upgradeClient', // User needs to upgrade the client.
|
| - ENTER_PASSPHRASE: 'enterPassphrase', // User needs to enter passphrase.
|
| + NO_ACTION: 'noAction', // No action to take.
|
| + REAUTHENTICATE: 'reauthenticate', // User needs to reauthenticate.
|
| + SIGNOUT_AND_SIGNIN:
|
| + 'signOutAndSignIn', // User needs to sign out and sign in.
|
| + UPGRADE_CLIENT: 'upgradeClient', // User needs to upgrade the client.
|
| + ENTER_PASSPHRASE: 'enterPassphrase', // User needs to enter passphrase.
|
| };
|
|
|
| /**
|
| @@ -105,7 +106,7 @@ cr.define('settings', function() {
|
| function SyncBrowserProxy() {}
|
|
|
| SyncBrowserProxy.prototype = {
|
| -<if expr="not chromeos">
|
| + /* <if expr="not chromeos"> */
|
| /**
|
| * Starts the signin process for the user. Does nothing if the user is
|
| * already signed in.
|
| @@ -122,14 +123,14 @@ cr.define('settings', function() {
|
| * Opens the multi-profile user manager.
|
| */
|
| manageOtherPeople: function() {},
|
| -</if>
|
| + /* </if> */
|
|
|
| -<if expr="chromeos">
|
| + /* <if expr="chromeos"> */
|
| /**
|
| * Signs the user out.
|
| */
|
| attemptUserExit: function() {},
|
| -</if>
|
| + /* </if> */
|
|
|
| /**
|
| * Gets the current sync status.
|
| @@ -178,7 +179,7 @@ cr.define('settings', function() {
|
| cr.addSingletonGetter(SyncBrowserProxyImpl);
|
|
|
| SyncBrowserProxyImpl.prototype = {
|
| -<if expr="not chromeos">
|
| + /* <if expr="not chromeos"> */
|
| /** @override */
|
| startSignIn: function() {
|
| chrome.send('SyncSetupStartSignIn');
|
| @@ -193,13 +194,13 @@ cr.define('settings', function() {
|
| manageOtherPeople: function() {
|
| chrome.send('SyncSetupManageOtherPeople');
|
| },
|
| -</if>
|
| -<if expr="chromeos">
|
| + /* </if> */
|
| + /* <if expr="chromeos"> */
|
| /** @override */
|
| attemptUserExit: function() {
|
| return chrome.send('AttemptUserExit');
|
| },
|
| -</if>
|
| + /* </if> */
|
|
|
| /** @override */
|
| getSyncStatus: function() {
|
| @@ -218,14 +219,14 @@ cr.define('settings', function() {
|
|
|
| /** @override */
|
| setSyncDatatypes: function(syncPrefs) {
|
| - return cr.sendWithPromise('SyncSetupSetDatatypes',
|
| - JSON.stringify(syncPrefs));
|
| + return cr.sendWithPromise(
|
| + 'SyncSetupSetDatatypes', JSON.stringify(syncPrefs));
|
| },
|
|
|
| /** @override */
|
| setSyncEncryption: function(syncPrefs) {
|
| - return cr.sendWithPromise('SyncSetupSetEncryption',
|
| - JSON.stringify(syncPrefs));
|
| + return cr.sendWithPromise(
|
| + 'SyncSetupSetEncryption', JSON.stringify(syncPrefs));
|
| },
|
|
|
| /** @override */
|
|
|