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

Side by Side Diff: chrome/browser/sync/sync_ui_util.h

Issue 2603283003: [MD Settings][People] Force sign out only in the case of unrecoverable error (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
OLDNEW
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 #ifndef CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 5 #ifndef CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
6 #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 6 #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 11 matching lines...) Expand all
22 enum MessageType { 22 enum MessageType {
23 PRE_SYNCED, // User has not set up sync. 23 PRE_SYNCED, // User has not set up sync.
24 SYNCED, // We are synced and authenticated to a gmail account. 24 SYNCED, // We are synced and authenticated to a gmail account.
25 SYNC_ERROR, // A sync error (such as invalid credentials) has occurred. 25 SYNC_ERROR, // A sync error (such as invalid credentials) has occurred.
26 SYNC_PROMO, // A situation has occurred which should be brought to the user's 26 SYNC_PROMO, // A situation has occurred which should be brought to the user's
27 // attention, but not as an error. 27 // attention, but not as an error.
28 }; 28 };
29 29
30 // The action associated with the sync status. 30 // The action associated with the sync status.
31 enum ActionType { 31 enum ActionType {
32 NO_ACTION, // No action to take. 32 NO_ACTION, // No action to take.
33 REAUTHENTICATE, // User needs to reauthenticate. 33 REAUTHENTICATE, // User needs to reauthenticate.
34 UPGRADE_CLIENT, // User needs to upgrade the client. 34 SIGNOUT_AND_SIGNIN, // User needs to sign out and sign in.
35 ENTER_PASSPHRASE, // User needs to enter their passphrase. 35 UPGRADE_CLIENT, // User needs to upgrade the client.
36 ENTER_PASSPHRASE, // User needs to enter their passphrase.
36 }; 37 };
37 38
38 enum StatusLabelStyle { 39 enum StatusLabelStyle {
39 PLAIN_TEXT, // Label will be plain-text only. 40 PLAIN_TEXT, // Label will be plain-text only.
40 WITH_HTML // Label may contain an HTML-formatted link. 41 WITH_HTML // Label may contain an HTML-formatted link.
41 }; 42 };
42 43
43 // Sync errors that should be exposed to the user through the avatar button. 44 // Sync errors that should be exposed to the user through the avatar button.
44 enum AvatarSyncErrorType { 45 enum AvatarSyncErrorType {
45 NO_SYNC_ERROR, // No sync error. 46 NO_SYNC_ERROR, // No sync error.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 int* content_string_id, 91 int* content_string_id,
91 int* button_string_id); 92 int* button_string_id);
92 #endif 93 #endif
93 94
94 MessageType GetStatus(Profile* profile, 95 MessageType GetStatus(Profile* profile,
95 browser_sync::ProfileSyncService* service, 96 browser_sync::ProfileSyncService* service,
96 const SigninManagerBase& signin); 97 const SigninManagerBase& signin);
97 98
98 } // namespace sync_ui_util 99 } // namespace sync_ui_util
99 #endif // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 100 #endif // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698