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

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

Issue 13196006: Move path functions from file_util to FilePath object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git try Created 7 years, 8 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 #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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 !restored_keystore_key_for_bootstrapping.empty()); 378 !restored_keystore_key_for_bootstrapping.empty());
379 sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl( 379 sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl(
380 &share_, 380 &share_,
381 encryptor, 381 encryptor,
382 restored_key_for_bootstrapping, 382 restored_key_for_bootstrapping,
383 restored_keystore_key_for_bootstrapping)); 383 restored_keystore_key_for_bootstrapping));
384 sync_encryption_handler_->AddObserver(this); 384 sync_encryption_handler_->AddObserver(this);
385 sync_encryption_handler_->AddObserver(&debug_info_event_listener_); 385 sync_encryption_handler_->AddObserver(&debug_info_event_listener_);
386 sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_); 386 sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_);
387 387
388 base::FilePath absolute_db_path(database_path_); 388 base::FilePath absolute_db_path = database_path_;
389 file_util::AbsolutePath(&absolute_db_path); 389 DCHECK(absolute_db_path.IsAbsolute());
390
390 scoped_ptr<syncable::DirectoryBackingStore> backing_store = 391 scoped_ptr<syncable::DirectoryBackingStore> backing_store =
391 internal_components_factory->BuildDirectoryBackingStore( 392 internal_components_factory->BuildDirectoryBackingStore(
392 credentials.email, absolute_db_path).Pass(); 393 credentials.email, absolute_db_path).Pass();
393 394
394 DCHECK(backing_store.get()); 395 DCHECK(backing_store.get());
395 const std::string& username = credentials.email; 396 const std::string& username = credentials.email;
396 share_.directory.reset( 397 share_.directory.reset(
397 new syncable::Directory( 398 new syncable::Directory(
398 backing_store.release(), 399 backing_store.release(),
399 unrecoverable_error_handler_, 400 unrecoverable_error_handler_,
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 int SyncManagerImpl::GetDefaultNudgeDelay() { 1401 int SyncManagerImpl::GetDefaultNudgeDelay() {
1401 return kDefaultNudgeDelayMilliseconds; 1402 return kDefaultNudgeDelayMilliseconds;
1402 } 1403 }
1403 1404
1404 // static. 1405 // static.
1405 int SyncManagerImpl::GetPreferencesNudgeDelay() { 1406 int SyncManagerImpl::GetPreferencesNudgeDelay() {
1406 return kPreferencesNudgeDelayMilliseconds; 1407 return kPreferencesNudgeDelayMilliseconds;
1407 } 1408 }
1408 1409
1409 } // namespace syncer 1410 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698