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

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

Issue 10828158: [Sync] Address msw's comments for r149747 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_ 5 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_
6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_ 6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 report_unrecoverable_error_function) OVERRIDE; 80 report_unrecoverable_error_function) OVERRIDE;
81 virtual void ThrowUnrecoverableError() OVERRIDE; 81 virtual void ThrowUnrecoverableError() OVERRIDE;
82 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; 82 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
83 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( 83 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
84 ModelTypeSet types) OVERRIDE; 84 ModelTypeSet types) OVERRIDE;
85 virtual bool PurgePartiallySyncedTypes() OVERRIDE; 85 virtual bool PurgePartiallySyncedTypes() OVERRIDE;
86 virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE; 86 virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE;
87 virtual void UpdateEnabledTypes( 87 virtual void UpdateEnabledTypes(
88 const ModelTypeSet& enabled_types) OVERRIDE; 88 const ModelTypeSet& enabled_types) OVERRIDE;
89 virtual void UpdateRegisteredInvalidationIds( 89 virtual void UpdateRegisteredInvalidationIds(
90 SyncNotifierObserver* handler, const ObjectIdSet& ids) OVERRIDE; 90 SyncNotifierObserver* handler,
akalin 2012/08/03 20:08:49 Done.
91 const ObjectIdSet& ids) OVERRIDE;
91 virtual void StartSyncingNormally( 92 virtual void StartSyncingNormally(
92 const ModelSafeRoutingInfo& routing_info) OVERRIDE; 93 const ModelSafeRoutingInfo& routing_info) OVERRIDE;
93 virtual void SetEncryptionPassphrase(const std::string& passphrase, 94 virtual void SetEncryptionPassphrase(const std::string& passphrase,
94 bool is_explicit) OVERRIDE; 95 bool is_explicit) OVERRIDE;
95 virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE; 96 virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE;
96 virtual void ConfigureSyncer( 97 virtual void ConfigureSyncer(
97 ConfigureReason reason, 98 ConfigureReason reason,
98 const ModelTypeSet& types_to_config, 99 const ModelTypeSet& types_to_config,
99 const ModelSafeRoutingInfo& new_routing_info, 100 const ModelSafeRoutingInfo& new_routing_info,
100 const base::Closure& ready_task, 101 const base::Closure& ready_task,
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 // conflict resolver) updated the nigori's encryption keys in this chrome 406 // conflict resolver) updated the nigori's encryption keys in this chrome
406 // instantiation. 407 // instantiation.
407 int nigori_overwrite_count_; 408 int nigori_overwrite_count_;
408 409
409 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); 410 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
410 }; 411 };
411 412
412 } // namespace syncer 413 } // namespace syncer
413 414
414 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ 415 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698