diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 03:50:20 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 03:50:20 +0000 |
| commit | 59bfebda5c0a2fdcebd8b7b3642ab57b18b32f37 (patch) | |
| tree | 774ecf17b93deeb02916ea0b3b58118ac4cf6312 /chrome/browser/sync/sync_ui_util.cc | |
| parent | 50aef1812c0b96126e27bd2d7718df158ef308dd (diff) | |
| download | chromium_src-59bfebda5c0a2fdcebd8b7b3642ab57b18b32f37.zip chromium_src-59bfebda5c0a2fdcebd8b7b3642ab57b18b32f37.tar.gz chromium_src-59bfebda5c0a2fdcebd8b7b3642ab57b18b32f37.tar.bz2 | |
Show error in the bookmarks bar if passphrase is not valid.
BUG=81492
TEST=
Review URL: http://codereview.chromium.org/7019023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_ui_util.cc')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 42bae87..75f30fc 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -239,8 +239,11 @@ MessageType GetStatus(ProfileSyncService* service) { } bool ShouldShowSyncErrorButton(ProfileSyncService* service) { - return service && !service->IsManaged() && service->HasSyncSetupCompleted() && - (GetStatus(service) == sync_ui_util::SYNC_ERROR); + return service && + ((!service->IsManaged() && + service->HasSyncSetupCompleted()) && + (GetStatus(service) == sync_ui_util::SYNC_ERROR || + service->IsPassphraseRequired())); } string16 GetSyncMenuLabel(ProfileSyncService* service) { |