diff options
author | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 19:40:59 +0000 |
---|---|---|
committer | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 19:40:59 +0000 |
commit | 6d201be0c55eccdc015124e221d2559a6da7fef0 (patch) | |
tree | 121e988c25e62017a08bcbe908a4e6a5f78d34f8 /chrome/browser/sync/syncable/directory_manager.cc | |
parent | dc9711fe5e00639471fd0edf195a4ada4f7d994d (diff) | |
download | chromium_src-6d201be0c55eccdc015124e221d2559a6da7fef0.zip chromium_src-6d201be0c55eccdc015124e221d2559a6da7fef0.tar.gz chromium_src-6d201be0c55eccdc015124e221d2559a6da7fef0.tar.bz2 |
Part 1 of removing PathSTring. I scrubbed files that are not
in chron's CL to avoid merge.
Review URL: http://codereview.chromium.org/393011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/syncable/directory_manager.cc')
-rw-r--r-- | chrome/browser/sync/syncable/directory_manager.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/syncable/directory_manager.cc b/chrome/browser/sync/syncable/directory_manager.cc index d934f94..be3ed0a 100644 --- a/chrome/browser/sync/syncable/directory_manager.cc +++ b/chrome/browser/sync/syncable/directory_manager.cc @@ -48,7 +48,7 @@ DirectoryManager::~DirectoryManager() { delete channel_; } -bool DirectoryManager::Open(const PathString& name) { +bool DirectoryManager::Open(const std::string& name) { bool was_open = false; const DirOpenResult result = OpenImpl(name, GetSyncDataDatabasePath(), &was_open); @@ -67,7 +67,7 @@ bool DirectoryManager::Open(const PathString& name) { } // Opens a directory. Returns false on error. -DirOpenResult DirectoryManager::OpenImpl(const PathString& name, +DirOpenResult DirectoryManager::OpenImpl(const std::string& name, const FilePath& path, bool* was_open) { bool opened = false; @@ -96,7 +96,7 @@ DirOpenResult DirectoryManager::OpenImpl(const PathString& name, // Marks a directory as closed. It might take a while until all the file // handles and resources are freed by other threads. -void DirectoryManager::Close(const PathString& name) { +void DirectoryManager::Close(const std::string& name) { // Erase from mounted and opened directory lists. { AutoLock lock(lock_); @@ -131,7 +131,7 @@ void DirectoryManager::GetOpenDirectories(DirNames* result) { } ScopedDirLookup::ScopedDirLookup(DirectoryManager* dirman, - const PathString& name) : dirman_(dirman) { + const std::string& name) : dirman_(dirman) { dir_ = dirman->managed_directory_ && (ComparePathNames(name, dirman->managed_directory_->name()) == 0) ? dirman->managed_directory_ : NULL; |