diff options
| author | jimblackler@google.com <jimblackler@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 11:03:23 +0000 |
|---|---|---|
| committer | jimblackler@google.com <jimblackler@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 11:03:23 +0000 |
| commit | f5fb1750651ff20871bbef23d7b6cb37aab24830 (patch) | |
| tree | b6a37c413025a97134ad2a8bb8b83b90a8bda7c0 /chrome/browser/sync/sync_ui_util.h | |
| parent | efda9787e33dac7e8e4e5a0a5ed0b012e10af56a (diff) | |
| download | chromium_src-f5fb1750651ff20871bbef23d7b6cb37aab24830.zip chromium_src-f5fb1750651ff20871bbef23d7b6cb37aab24830.tar.gz chromium_src-f5fb1750651ff20871bbef23d7b6cb37aab24830.tar.bz2 | |
Re-application of CL originally reviewed here: http://codereview.chromium.org/8383036 That CL was wound back after test failures not caught by commitbot. Those test failures fixed here.
Adding parameter to GetStatusLabels to indicate if links are acceptable, as some platforms cannot handle links in all the places these messages are shown."
This reverts commit 8a7d864f6069576f60bc9a63b9916d86a6157f96.
BUG=N/A
TEST=N/A
Review URL: http://codereview.chromium.org/8634008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112194 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, 7 insertions, 1 deletions
diff --git a/chrome/browser/sync/sync_ui_util.h b/chrome/browser/sync/sync_ui_util.h index 3498a63..a729ebf 100644 --- a/chrome/browser/sync/sync_ui_util.h +++ b/chrome/browser/sync/sync_ui_util.h @@ -32,13 +32,19 @@ enum MessageType { // attention, but not as an error. }; +enum StatusLabelStyle { + PLAIN_TEXT, // Label will be plain-text only. + WITH_HTML // Label may contain an HTML-formatted link. +}; + // TODO(akalin): audit the use of ProfileSyncService* service below, // and use const ProfileSyncService& service where possible. // Create status and link labels for the current status labels and link text // by querying |service|. -// |status_label| may contain an HTML-formatted link. +// |style| sets the link properties, see |StatusLabelStyle|. MessageType GetStatusLabels(ProfileSyncService* service, + StatusLabelStyle style, string16* status_label, string16* link_label); |