Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: sync/internal_api/sync_manager_impl.cc

Issue 10828158: [Sync] Address msw's comments for r149747 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/test/fake_sync_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/internal_api/sync_manager_impl.h" 5 #include "sync/internal_api/sync_manager_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 732
733 void SyncManagerImpl::UpdateEnabledTypes( 733 void SyncManagerImpl::UpdateEnabledTypes(
734 const ModelTypeSet& enabled_types) { 734 const ModelTypeSet& enabled_types) {
735 DCHECK(thread_checker_.CalledOnValidThread()); 735 DCHECK(thread_checker_.CalledOnValidThread());
736 sync_notifier_->UpdateRegisteredIds( 736 sync_notifier_->UpdateRegisteredIds(
737 this, 737 this,
738 ModelTypeSetToObjectIdSet(enabled_types)); 738 ModelTypeSetToObjectIdSet(enabled_types));
739 } 739 }
740 740
741 void SyncManagerImpl::UpdateRegisteredInvalidationIds( 741 void SyncManagerImpl::UpdateRegisteredInvalidationIds(
742 SyncNotifierObserver* handler, const ObjectIdSet& ids) { 742 SyncNotifierObserver* handler,
743 const ObjectIdSet& ids) {
743 DCHECK(thread_checker_.CalledOnValidThread()); 744 DCHECK(thread_checker_.CalledOnValidThread());
744 sync_notifier_->UpdateRegisteredIds(handler, ids); 745 sync_notifier_->UpdateRegisteredIds(handler, ids);
745 } 746 }
746 747
747 void SyncManagerImpl::SetEncryptionPassphrase( 748 void SyncManagerImpl::SetEncryptionPassphrase(
748 const std::string& passphrase, 749 const std::string& passphrase,
749 bool is_explicit) { 750 bool is_explicit) {
750 DCHECK(thread_checker_.CalledOnValidThread()); 751 DCHECK(thread_checker_.CalledOnValidThread());
751 // We do not accept empty passphrases. 752 // We do not accept empty passphrases.
752 if (passphrase.empty()) { 753 if (passphrase.empty()) {
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1886 int SyncManagerImpl::GetDefaultNudgeDelay() { 1887 int SyncManagerImpl::GetDefaultNudgeDelay() {
1887 return kDefaultNudgeDelayMilliseconds; 1888 return kDefaultNudgeDelayMilliseconds;
1888 } 1889 }
1889 1890
1890 // static. 1891 // static.
1891 int SyncManagerImpl::GetPreferencesNudgeDelay() { 1892 int SyncManagerImpl::GetPreferencesNudgeDelay() {
1892 return kPreferencesNudgeDelayMilliseconds; 1893 return kPreferencesNudgeDelayMilliseconds;
1893 } 1894 }
1894 1895
1895 } // namespace syncer 1896 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/test/fake_sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698