diff options
| author | haitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 21:18:48 +0000 |
|---|---|---|
| committer | haitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-29 21:18:48 +0000 |
| commit | be9cfbcea00f811a40987ea2bd01e3f90dfd99cc (patch) | |
| tree | b087e849e713e48bb9104865aef5d3f37ec47f65 /sync/internal_api/base_transaction.cc | |
| parent | cfa4e4bc94157b66e59d02c721387323a06b2af3 (diff) | |
| download | chromium_src-be9cfbcea00f811a40987ea2bd01e3f90dfd99cc.zip chromium_src-be9cfbcea00f811a40987ea2bd01e3f90dfd99cc.tar.gz chromium_src-be9cfbcea00f811a40987ea2bd01e3f90dfd99cc.tar.bz2 | |
Let ProfileSyncService start backup or rollback backend when no user is signed
or when rollback command was received.
BUG=362679
TBR=rogerta@chromium.org
Review URL: https://codereview.chromium.org/261543002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/base_transaction.cc')
| -rw-r--r-- | sync/internal_api/base_transaction.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sync/internal_api/base_transaction.cc b/sync/internal_api/base_transaction.cc index cbfb246..6fae52c 100644 --- a/sync/internal_api/base_transaction.cc +++ b/sync/internal_api/base_transaction.cc @@ -25,8 +25,11 @@ Cryptographer* BaseTransaction::GetCryptographer() const { } ModelTypeSet BaseTransaction::GetEncryptedTypes() const { - return GetDirectory()->GetNigoriHandler()->GetEncryptedTypes( - this->GetWrappedTrans()); + syncable::NigoriHandler* nigori_handler = + GetDirectory()->GetNigoriHandler(); + return nigori_handler ? + nigori_handler->GetEncryptedTypes(this->GetWrappedTrans()) : + ModelTypeSet(); } } // namespace syncer |