From 6d201be0c55eccdc015124e221d2559a6da7fef0 Mon Sep 17 00:00:00 2001 From: "munjal@chromium.org" Date: Fri, 13 Nov 2009 19:40:59 +0000 Subject: 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 --- chrome/browser/sync/syncable/directory_manager.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'chrome/browser/sync/syncable/directory_manager.h') diff --git a/chrome/browser/sync/syncable/directory_manager.h b/chrome/browser/sync/syncable/directory_manager.h index 5d9a106..a977dde 100644 --- a/chrome/browser/sync/syncable/directory_manager.h +++ b/chrome/browser/sync/syncable/directory_manager.h @@ -12,6 +12,7 @@ #ifndef CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ #define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_MANAGER_H_ +#include #include #include "base/atomicops.h" @@ -36,7 +37,7 @@ struct DirectoryManagerEvent { CLOSED_ALL, SHUTDOWN, } what_happened; - PathString dirname; + std::string dirname; DirOpenResult error; // Only for OPEN_FAILED. typedef DirectoryManagerEvent EventType; static inline bool IsChannelShutdownEvent(const EventType& event) { @@ -60,23 +61,23 @@ class DirectoryManager { // Opens a directory. Returns false on error. // Name parameter is the the user's login, // MUST already have been converted to a common case. - bool Open(const PathString& name); + bool Open(const std::string& name); // Marks a directory as closed. It might take a while until all the // file handles and resources are freed by other threads. - void Close(const PathString& name); + void Close(const std::string& name); // Should be called at App exit. void FinalSaveChangesForAll(); // Gets the list of currently open directory names. - typedef std::vector DirNames; + typedef std::vector DirNames; void GetOpenDirectories(DirNames* result); Channel* channel() const { return channel_; } protected: - DirOpenResult OpenImpl(const PathString& name, const FilePath& path, + DirOpenResult OpenImpl(const std::string& name, const FilePath& path, bool* was_open); // Helpers for friend class ScopedDirLookup: @@ -98,7 +99,7 @@ class DirectoryManager { class ScopedDirLookup { public: - ScopedDirLookup(DirectoryManager* dirman, const PathString& name); + ScopedDirLookup(DirectoryManager* dirman, const std::string& name); ~ScopedDirLookup(); inline bool good() { -- cgit v1.1