From 3ce42e2d90efdb63b2f34d62b48e7ae3901566fb Mon Sep 17 00:00:00 2001 From: "tim@chromium.org" Date: Wed, 10 Nov 2010 21:14:02 +0000 Subject: fix arm build. BUG= TEST= Review URL: http://codereview.chromium.org/4775001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65703 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/sync/profile_sync_service.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index c235ad5..601807ba 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -921,9 +921,9 @@ void ProfileSyncService::GetRegisteredDataTypes( } bool ProfileSyncService::IsUsingSecondaryPassphrase() const { - return backend_.get() && backend_->IsUsingExplicitPassphrase() || + return backend_.get() && (backend_->IsUsingExplicitPassphrase() || (tried_implicit_gaia_remove_when_bug_62103_fixed_ && - observed_passphrase_required_); + observed_passphrase_required_)); } bool ProfileSyncService::IsCryptographerReady() const { -- cgit v1.1