diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 03:58:38 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 03:58:38 +0000 |
| commit | bd985a221a00d320a4fb585c3a5a920724d79621 (patch) | |
| tree | 90ca453866af87f2182b71504a709b25a3fc92de /chrome/browser/sync/sync_ui_util.h | |
| parent | f1ef8ef056879512772a3ee4015cc36dd5ad5dc7 (diff) | |
| download | chromium_src-bd985a221a00d320a4fb585c3a5a920724d79621.zip chromium_src-bd985a221a00d320a4fb585c3a5a920724d79621.tar.gz chromium_src-bd985a221a00d320a4fb585c3a5a920724d79621.tar.bz2 | |
Removed ProfileSyncService::UIShouldDepictAuthInProgress
Changed so all code queries the auth-in-progress status directly from SigninManager.
BUG=95269
TEST=existing unit tests suffice
Review URL: http://codereview.chromium.org/9959038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_ui_util.h')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/sync/sync_ui_util.h b/chrome/browser/sync/sync_ui_util.h index 222a891..1bade70 100644 --- a/chrome/browser/sync/sync_ui_util.h +++ b/chrome/browser/sync/sync_ui_util.h @@ -44,6 +44,7 @@ enum StatusLabelStyle { // by querying |service|. // |style| sets the link properties, see |StatusLabelStyle|. MessageType GetStatusLabels(ProfileSyncService* service, + const SigninManager& signin, StatusLabelStyle style, string16* status_label, string16* link_label); @@ -51,6 +52,7 @@ MessageType GetStatusLabels(ProfileSyncService* service, // Same as above but for use specifically on the New Tab Page. // |status_label| may contain an HTML-formatted link. MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service, + const SigninManager& signin, string16* status_label, string16* link_label); @@ -58,14 +60,16 @@ MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service, // |menu_item_label|, |bubble_message|, and |bubble_accept_label| must not be // NULL. void GetStatusLabelsForSyncGlobalError(ProfileSyncService* service, + const SigninManager& signin, string16* menu_item_label, string16* bubble_message, string16* bubble_accept_label); -MessageType GetStatus(ProfileSyncService* service); +MessageType GetStatus(ProfileSyncService* service, const SigninManager& signin); // Returns a string with the synchronization status. -string16 GetSyncMenuLabel(ProfileSyncService* service); +string16 GetSyncMenuLabel(ProfileSyncService* service, + const SigninManager& signin); void AddBoolSyncDetail(base::ListValue* details, const std::string& stat_name, |