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

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: 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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 !restored_keystore_key_for_bootstrapping.empty()); 376 !restored_keystore_key_for_bootstrapping.empty());
377 sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl( 377 sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl(
378 &share_, 378 &share_,
379 encryptor, 379 encryptor,
380 restored_key_for_bootstrapping, 380 restored_key_for_bootstrapping,
381 restored_keystore_key_for_bootstrapping)); 381 restored_keystore_key_for_bootstrapping));
382 sync_encryption_handler_->AddObserver(this); 382 sync_encryption_handler_->AddObserver(this);
383 sync_encryption_handler_->AddObserver(&debug_info_event_listener_); 383 sync_encryption_handler_->AddObserver(&debug_info_event_listener_);
384 sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_); 384 sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_);
385 385
386 base::FilePath absolute_db_path(database_path_); 386 base::FilePath absolute_db_path(database_path_.AsAbsolute());
387 file_util::AbsolutePath(&absolute_db_path);
388 scoped_ptr<syncable::DirectoryBackingStore> backing_store = 387 scoped_ptr<syncable::DirectoryBackingStore> backing_store =
389 internal_components_factory->BuildDirectoryBackingStore( 388 internal_components_factory->BuildDirectoryBackingStore(
390 credentials.email, absolute_db_path).Pass(); 389 credentials.email, absolute_db_path).Pass();
391 390
392 DCHECK(backing_store.get()); 391 DCHECK(backing_store.get());
393 const std::string& username = credentials.email; 392 const std::string& username = credentials.email;
394 share_.directory.reset( 393 share_.directory.reset(
395 new syncable::Directory( 394 new syncable::Directory(
396 backing_store.release(), 395 backing_store.release(),
397 unrecoverable_error_handler_, 396 unrecoverable_error_handler_,
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1398 int SyncManagerImpl::GetDefaultNudgeDelay() { 1397 int SyncManagerImpl::GetDefaultNudgeDelay() {
1399 return kDefaultNudgeDelayMilliseconds; 1398 return kDefaultNudgeDelayMilliseconds;
1400 } 1399 }
1401 1400
1402 // static. 1401 // static.
1403 int SyncManagerImpl::GetPreferencesNudgeDelay() { 1402 int SyncManagerImpl::GetPreferencesNudgeDelay() {
1404 return kPreferencesNudgeDelayMilliseconds; 1403 return kPreferencesNudgeDelayMilliseconds;
1405 } 1404 }
1406 1405
1407 } // namespace syncer 1406 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698