Index: chrome/browser/sync/sync_ui_util.cc |
=================================================================== |
--- chrome/browser/sync/sync_ui_util.cc (revision 110908) |
+++ chrome/browser/sync/sync_ui_util.cc (working copy) |
@@ -132,28 +132,16 @@ |
// Returns the message that should be displayed when the user is authenticated |
// and can connect to the sync server. If the user hasn't yet authenticated, an |
// empty string is returned. |
-string16 GetSyncedStateStatusLabel(ProfileSyncService* service, |
- StatusLabelStyle style) { |
+string16 GetSyncedStateStatusLabel(ProfileSyncService* service) { |
string16 label; |
string16 user_name(service->GetAuthenticatedUsername()); |
if (user_name.empty()) |
return label; |
- // Message may also carry additional advice with an HTML link, if acceptable. |
- switch (style) { |
- case PLAIN_TEXT: |
- return l10n_util::GetStringFUTF16( |
- IDS_SYNC_ACCOUNT_SYNCING_TO_USER, |
- user_name); |
- case WITH_HTML: |
- return l10n_util::GetStringFUTF16( |
- IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK, |
- user_name, |
- ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); |
- default: |
- NOTREACHED(); |
- return NULL; |
- } |
+ return l10n_util::GetStringFUTF16( |
+ IDS_SYNC_ACCOUNT_SYNCING_TO_USER, |
+ user_name, |
+ ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); |
} |
void GetStatusForActionableError( |
@@ -187,7 +175,6 @@ |
// status_label and link_label must either be both NULL or both non-NULL. |
MessageType GetStatusInfo(ProfileSyncService* service, |
- StatusLabelStyle style, |
string16* status_label, |
string16* link_label) { |
DCHECK_EQ(status_label == NULL, link_label == NULL); |
@@ -250,7 +237,7 @@ |
// current synced status. Return SYNC_PROMO so that |
// the configure link will still be shown. |
if (status_label && link_label) { |
- status_label->assign(GetSyncedStateStatusLabel(service, style)); |
+ status_label->assign(GetSyncedStateStatusLabel(service)); |
link_label->assign( |
l10n_util::GetStringUTF16(IDS_SYNC_PASSWORD_SYNC_ATTENTION)); |
} |
@@ -260,7 +247,7 @@ |
// There is no error. Display "Last synced..." message. |
if (status_label) |
- status_label->assign(GetSyncedStateStatusLabel(service, style)); |
+ status_label->assign(GetSyncedStateStatusLabel(service)); |
return SYNCED; |
} else { |
// Either show auth error information with a link to re-login, auth in prog, |
@@ -342,18 +329,17 @@ |
} |
// Fallback to default. |
- return GetStatusInfo(service, WITH_HTML, status_label, link_label); |
+ return GetStatusInfo(service, status_label, link_label); |
} |
} // namespace |
MessageType GetStatusLabels(ProfileSyncService* service, |
- StatusLabelStyle style, |
string16* status_label, |
string16* link_label) { |
DCHECK(status_label); |
DCHECK(link_label); |
- return sync_ui_util::GetStatusInfo(service, style, status_label, link_label); |
+ return sync_ui_util::GetStatusInfo(service, status_label, link_label); |
} |
MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service, |
@@ -404,7 +390,7 @@ |
} |
MessageType GetStatus(ProfileSyncService* service) { |
- return sync_ui_util::GetStatusInfo(service, WITH_HTML, NULL, NULL); |
+ return sync_ui_util::GetStatusInfo(service, NULL, NULL); |
} |
string16 GetSyncMenuLabel(ProfileSyncService* service) { |