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

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

Issue 2267013002: [MD User Menu] New way to handle supervised user auth error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comments Created 4 years, 4 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
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16 matching lines...) Expand all
27 enum StatusLabelStyle { 27 enum StatusLabelStyle {
28 PLAIN_TEXT, // Label will be plain-text only. 28 PLAIN_TEXT, // Label will be plain-text only.
29 WITH_HTML // Label may contain an HTML-formatted link. 29 WITH_HTML // Label may contain an HTML-formatted link.
30 }; 30 };
31 31
32 // Sync errors that should be exposed to the user through the avatar button. 32 // Sync errors that should be exposed to the user through the avatar button.
33 enum AvatarSyncErrorType { 33 enum AvatarSyncErrorType {
34 NO_SYNC_ERROR, // No sync error. 34 NO_SYNC_ERROR, // No sync error.
35 MANAGED_USER_UNRECOVERABLE_ERROR, // Unrecoverable error for managed users. 35 MANAGED_USER_UNRECOVERABLE_ERROR, // Unrecoverable error for managed users.
36 UNRECOVERABLE_ERROR, // Unrecoverable error for regular users. 36 UNRECOVERABLE_ERROR, // Unrecoverable error for regular users.
37 SUPERVISED_USER_AUTH_ERROR, // Auth token error for supervised users.
37 AUTH_ERROR, // Authentication error. 38 AUTH_ERROR, // Authentication error.
38 UPGRADE_CLIENT_ERROR, // Out-of-date client error. 39 UPGRADE_CLIENT_ERROR, // Out-of-date client error.
39 PASSPHRASE_ERROR // Sync passphrase error. 40 PASSPHRASE_ERROR // Sync passphrase error.
40 }; 41 };
41 42
42 // TODO(akalin): audit the use of ProfileSyncService* service below, 43 // TODO(akalin): audit the use of ProfileSyncService* service below,
43 // and use const ProfileSyncService& service where possible. 44 // and use const ProfileSyncService& service where possible.
44 45
45 // Create status and link labels for the current status labels and link text 46 // Create status and link labels for the current status labels and link text
46 // by querying |service|. 47 // by querying |service|.
(...skipping 28 matching lines...) Expand all
75 int* content_string_id, 76 int* content_string_id,
76 int* button_string_id); 77 int* button_string_id);
77 #endif 78 #endif
78 79
79 MessageType GetStatus(Profile* profile, 80 MessageType GetStatus(Profile* profile,
80 ProfileSyncService* service, 81 ProfileSyncService* service,
81 const SigninManagerBase& signin); 82 const SigninManagerBase& signin);
82 83
83 } // namespace sync_ui_util 84 } // namespace sync_ui_util
84 #endif // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 85 #endif // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698