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

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

Issue 1177853002: [Sync] Add ability to save/restore Nigori to SyncEncryptionHandlerImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 } 397 }
398 398
399 void SyncManagerImpl::OnPassphraseTypeChanged( 399 void SyncManagerImpl::OnPassphraseTypeChanged(
400 PassphraseType type, 400 PassphraseType type,
401 base::Time explicit_passphrase_time) { 401 base::Time explicit_passphrase_time) {
402 allstatus_.SetPassphraseType(type); 402 allstatus_.SetPassphraseType(type);
403 allstatus_.SetKeystoreMigrationTime( 403 allstatus_.SetKeystoreMigrationTime(
404 sync_encryption_handler_->migration_time()); 404 sync_encryption_handler_->migration_time());
405 } 405 }
406 406
407 void SyncManagerImpl::OnLocalSetCustomPassphrase(
408 const SyncEncryptionHandler::NigoriState& nigori_state) {
409 }
410
407 void SyncManagerImpl::StartSyncingNormally( 411 void SyncManagerImpl::StartSyncingNormally(
408 const ModelSafeRoutingInfo& routing_info, 412 const ModelSafeRoutingInfo& routing_info,
409 base::Time last_poll_time) { 413 base::Time last_poll_time) {
410 // Start the sync scheduler. 414 // Start the sync scheduler.
411 // TODO(sync): We always want the newest set of routes when we switch back 415 // TODO(sync): We always want the newest set of routes when we switch back
412 // to normal mode. Figure out how to enforce set_routing_info is always 416 // to normal mode. Figure out how to enforce set_routing_info is always
413 // appropriately set and that it's only modified when switching to normal 417 // appropriately set and that it's only modified when switching to normal
414 // mode. 418 // mode.
415 DCHECK(thread_checker_.CalledOnValidThread()); 419 DCHECK(thread_checker_.CalledOnValidThread());
416 session_context_->SetRoutingInfo(routing_info); 420 session_context_->SetRoutingInfo(routing_info);
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 bool SyncManagerImpl::HasDirectoryTypeDebugInfoObserver( 1028 bool SyncManagerImpl::HasDirectoryTypeDebugInfoObserver(
1025 syncer::TypeDebugInfoObserver* observer) { 1029 syncer::TypeDebugInfoObserver* observer) {
1026 return model_type_registry_->HasDirectoryTypeDebugInfoObserver(observer); 1030 return model_type_registry_->HasDirectoryTypeDebugInfoObserver(observer);
1027 } 1031 }
1028 1032
1029 void SyncManagerImpl::RequestEmitDebugInfo() { 1033 void SyncManagerImpl::RequestEmitDebugInfo() {
1030 model_type_registry_->RequestEmitDebugInfo(); 1034 model_type_registry_->RequestEmitDebugInfo();
1031 } 1035 }
1032 1036
1033 } // namespace syncer 1037 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698