From 34004eea5940a37644ce70707470647091958cd2 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Wed, 3 Dec 2008 20:40:13 +0000 Subject: Backing out r6299 due to DirectoryWatcherTest.SubDir (base_unittests) failure git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6304 0039d316-1c4b-4281-b951-d872f2087c98 --- base/file_path.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'base/file_path.h') diff --git a/base/file_path.h b/base/file_path.h index fb2cc57..fc55a7a 100644 --- a/base/file_path.h +++ b/base/file_path.h @@ -146,7 +146,6 @@ class FilePath { // only to |component| is returned. |component| must be a relative path; // it is an error to pass an absolute path. FilePath Append(const StringType& component) const WARN_UNUSED_RESULT; - FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT; // Returns true if this FilePath contains an absolute path. On Windows, an // absolute path begins with either a drive letter specification followed by @@ -169,6 +168,13 @@ class FilePath { std::wstring ToWStringHack() const; private: + // If this FilePath contains a drive letter specification, returns the + // position of the last character of the drive letter specification, + // otherwise returns npos. This can only be true on Windows, when a pathname + // begins with a letter followed by a colon. On other platforms, this always + // returns npos. + StringType::size_type FindDriveLetter() const; + // Remove trailing separators from this object. If the path is absolute, it // will never be stripped any more than to refer to the absolute root // directory, so "////" will become "/", not "". A leading pair of -- cgit v1.1