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

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

Issue 10916036: [Sync] Implement keystore migration support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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/sync_manager_impl_unittest.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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 void SyncManagerImpl::OnEncryptionComplete() { 545 void SyncManagerImpl::OnEncryptionComplete() {
546 // Does nothing. 546 // Does nothing.
547 } 547 }
548 548
549 void SyncManagerImpl::OnCryptographerStateChanged( 549 void SyncManagerImpl::OnCryptographerStateChanged(
550 Cryptographer* cryptographer) { 550 Cryptographer* cryptographer) {
551 allstatus_.SetCryptographerReady(cryptographer->is_ready()); 551 allstatus_.SetCryptographerReady(cryptographer->is_ready());
552 allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys()); 552 allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys());
553 } 553 }
554 554
555 void SyncManagerImpl::OnPassphraseStateChanged(PassphraseState state) { 555 void SyncManagerImpl::OnPassphraseTypeChanged(PassphraseType type) {
556 // Does nothing. 556 // Does nothing.
557 } 557 }
558 558
559 void SyncManagerImpl::StartSyncingNormally( 559 void SyncManagerImpl::StartSyncingNormally(
560 const ModelSafeRoutingInfo& routing_info) { 560 const ModelSafeRoutingInfo& routing_info) {
561 // Start the sync scheduler. 561 // Start the sync scheduler.
562 // TODO(sync): We always want the newest set of routes when we switch back 562 // TODO(sync): We always want the newest set of routes when we switch back
563 // to normal mode. Figure out how to enforce set_routing_info is always 563 // to normal mode. Figure out how to enforce set_routing_info is always
564 // appropriately set and that it's only modified when switching to normal 564 // appropriately set and that it's only modified when switching to normal
565 // mode. 565 // mode.
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 int SyncManagerImpl::GetDefaultNudgeDelay() { 1346 int SyncManagerImpl::GetDefaultNudgeDelay() {
1347 return kDefaultNudgeDelayMilliseconds; 1347 return kDefaultNudgeDelayMilliseconds;
1348 } 1348 }
1349 1349
1350 // static. 1350 // static.
1351 int SyncManagerImpl::GetPreferencesNudgeDelay() { 1351 int SyncManagerImpl::GetPreferencesNudgeDelay() {
1352 return kPreferencesNudgeDelayMilliseconds; 1352 return kPreferencesNudgeDelayMilliseconds;
1353 } 1353 }
1354 1354
1355 } // namespace syncer 1355 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/sync_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698