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

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

Issue 10824410: [Sync] Refactor passphrase state handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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/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 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 void SyncManagerImpl::OnEncryptionComplete() { 551 void SyncManagerImpl::OnEncryptionComplete() {
552 // Does nothing. 552 // Does nothing.
553 } 553 }
554 554
555 void SyncManagerImpl::OnCryptographerStateChanged( 555 void SyncManagerImpl::OnCryptographerStateChanged(
556 Cryptographer* cryptographer) { 556 Cryptographer* cryptographer) {
557 allstatus_.SetCryptographerReady(cryptographer->is_ready()); 557 allstatus_.SetCryptographerReady(cryptographer->is_ready());
558 allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys()); 558 allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys());
559 } 559 }
560 560
561 void SyncManagerImpl::OnPassphraseStateChanged(PassphraseState state) {
562 // Does nothing.
563 }
564
561 void SyncManagerImpl::StartSyncingNormally( 565 void SyncManagerImpl::StartSyncingNormally(
562 const ModelSafeRoutingInfo& routing_info) { 566 const ModelSafeRoutingInfo& routing_info) {
563 // Start the sync scheduler. 567 // Start the sync scheduler.
564 // TODO(sync): We always want the newest set of routes when we switch back 568 // TODO(sync): We always want the newest set of routes when we switch back
565 // to normal mode. Figure out how to enforce set_routing_info is always 569 // to normal mode. Figure out how to enforce set_routing_info is always
566 // appropriately set and that it's only modified when switching to normal 570 // appropriately set and that it's only modified when switching to normal
567 // mode. 571 // mode.
568 DCHECK(thread_checker_.CalledOnValidThread()); 572 DCHECK(thread_checker_.CalledOnValidThread());
569 session_context_->set_routing_info(routing_info); 573 session_context_->set_routing_info(routing_info);
570 scheduler_->Start(SyncScheduler::NORMAL_MODE); 574 scheduler_->Start(SyncScheduler::NORMAL_MODE);
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 int SyncManagerImpl::GetDefaultNudgeDelay() { 1368 int SyncManagerImpl::GetDefaultNudgeDelay() {
1365 return kDefaultNudgeDelayMilliseconds; 1369 return kDefaultNudgeDelayMilliseconds;
1366 } 1370 }
1367 1371
1368 // static. 1372 // static.
1369 int SyncManagerImpl::GetPreferencesNudgeDelay() { 1373 int SyncManagerImpl::GetPreferencesNudgeDelay() {
1370 return kPreferencesNudgeDelayMilliseconds; 1374 return kPreferencesNudgeDelayMilliseconds;
1371 } 1375 }
1372 1376
1373 } // namespace syncer 1377 } // 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