diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 00:11:17 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 00:11:17 +0000 |
| commit | d2a9612a34f1acca05e72fbfe33f8da4b597f3f5 (patch) | |
| tree | a6c9602827cc3af02ce1b8a0b9fa035126e3a599 /chrome/browser | |
| parent | dc0b5a18eac8b3c5db62733fbfba5136da3486a4 (diff) | |
| download | chromium_src-d2a9612a34f1acca05e72fbfe33f8da4b597f3f5.zip chromium_src-d2a9612a34f1acca05e72fbfe33f8da4b597f3f5.tar.gz chromium_src-d2a9612a34f1acca05e72fbfe33f8da4b597f3f5.tar.bz2 | |
Revert 105010 - [Sync] Use IsPassphraseRequiredForDecryption() for sync error bubble
This prevents the bubble from showing up if there are no encrypted
types.
BUG=99875
TEST=
Review URL: http://codereview.chromium.org/8231026
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/8273025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 6627d60..79c8fd5 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -389,7 +389,7 @@ bool ShouldShowSyncErrorButton(ProfileSyncService* service) { ((!service->IsManaged() && service->HasSyncSetupCompleted()) && (GetStatus(service) == sync_ui_util::SYNC_ERROR || - service->IsPassphraseRequiredForDecryption())); + service->IsPassphraseRequired())); } string16 GetSyncMenuLabel(ProfileSyncService* service) { |