Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: chrome/browser/resources/settings/people_page/sync_browser_proxy.js

Issue 2457483002: [MD Settings][Sync Settings] Updates sync status messages (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..812348d57d73f55dc9840d82b248f058208ddb18 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,17 @@ cr.exportPath('settings');
*/
settings.SyncStatus;
+
+/**
+ * @enum {string}
+ */
+settings.StatusAction = {
tommycli 2016/10/28 21:21:09 Add a note that this must be kept in sync with the
Moe 2016/11/01 19:44:01 Done.
+ 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 +121,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 +194,12 @@ cr.define('settings', function() {
chrome.send('SyncSetupManageOtherPeople');
},
</if>
+<if expr="chromeos">
+ /** @override */
+ attemptUserExit: function() {
+ return chrome.send('AttemptUserExit');
+ },
+</if>
/** @override */
getSyncStatus: function() {

Powered by Google App Engine
This is Rietveld 408576698