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

Side by Side Diff: sync/internal_api/public/sync_manager.h

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move GetEncryptionKey logic into GetUpdates Created 8 years, 5 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_PUBLIC_SYNC_MANAGER_H_ 5 #ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
6 #define SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_ 6 #define SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 bool use_ssl, 375 bool use_ssl,
376 const scoped_refptr<base::TaskRunner>& blocking_task_runner, 376 const scoped_refptr<base::TaskRunner>& blocking_task_runner,
377 scoped_ptr<HttpPostProviderFactory> post_factory, 377 scoped_ptr<HttpPostProviderFactory> post_factory,
378 const syncer::ModelSafeRoutingInfo& model_safe_routing_info, 378 const syncer::ModelSafeRoutingInfo& model_safe_routing_info,
379 const std::vector<syncer::ModelSafeWorker*>& workers, 379 const std::vector<syncer::ModelSafeWorker*>& workers,
380 syncer::ExtensionsActivityMonitor* extensions_activity_monitor, 380 syncer::ExtensionsActivityMonitor* extensions_activity_monitor,
381 ChangeDelegate* change_delegate, 381 ChangeDelegate* change_delegate,
382 const SyncCredentials& credentials, 382 const SyncCredentials& credentials,
383 scoped_ptr<syncer::SyncNotifier> sync_notifier, 383 scoped_ptr<syncer::SyncNotifier> sync_notifier,
384 const std::string& restored_key_for_bootstrapping, 384 const std::string& restored_key_for_bootstrapping,
385 bool keystore_encryption_enabled,
tim (not reviewing) 2012/07/26 21:53:15 ahem. enum police :/ I suppose this is temporary
Nicolas Zea 2012/07/27 00:43:15 Yeah, since this is just there while the feature i
385 TestingMode testing_mode, 386 TestingMode testing_mode,
386 syncer::Encryptor* encryptor, 387 syncer::Encryptor* encryptor,
387 syncer::UnrecoverableErrorHandler* unrecoverable_error_handler, 388 syncer::UnrecoverableErrorHandler* unrecoverable_error_handler,
388 syncer::ReportUnrecoverableErrorFunction 389 syncer::ReportUnrecoverableErrorFunction
389 report_unrecoverable_error_function) = 0; 390 report_unrecoverable_error_function) = 0;
390 391
391 // Throw an unrecoverable error from a transaction (mostly used for 392 // Throw an unrecoverable error from a transaction (mostly used for
392 // testing). 393 // testing).
393 virtual void ThrowUnrecoverableError() = 0; 394 virtual void ThrowUnrecoverableError() = 0;
394 395
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 virtual bool ReceivedExperiment(syncer::Experiments* experiments) const = 0; 517 virtual bool ReceivedExperiment(syncer::Experiments* experiments) const = 0;
517 518
518 // Uses a read-only transaction to determine if the directory being synced has 519 // Uses a read-only transaction to determine if the directory being synced has
519 // any remaining unsynced items. May be called on any thread. 520 // any remaining unsynced items. May be called on any thread.
520 virtual bool HasUnsyncedItems() const = 0; 521 virtual bool HasUnsyncedItems() const = 0;
521 }; 522 };
522 523
523 } // namespace syncer 524 } // namespace syncer
524 525
525 #endif // SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_ 526 #endif // SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698