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

Unified Diff: base/file_path.h

Issue 335042: Revert 30149 - The existing file_util::AbsolutePath() function was already do... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/file_path.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/file_path.h
===================================================================
--- base/file_path.h (revision 30151)
+++ base/file_path.h (working copy)
@@ -178,6 +178,18 @@
// and BaseName().value() on each child component.
void GetComponents(std::vector<FilePath::StringType>* components) const;
+ // Returns true, and sets *path to resulting full path, if relative_path can
+ // be applied to current path by resolving any '..' it may contain. Returns
+ // false otherwise, e.g., if relative path is absolute, or if it climbs back
+ // up the hierarchy too far (i.e., beyond the root of current path).
+ //
+ // Note that if the current path ends with a file name, we won't try to
+ // figure it out (so this method doesn't go to the disk) and we will blindly
+ // append relative_path at the end of the current path, including the file
+ // name in the current path (if any).
+ bool AppendAndResolveRelative(const FilePath& relative_path,
+ FilePath* path) const;
+
// Returns true if this FilePath is a strict parent of the |child|. Absolute
// and relative paths are accepted i.e. is /foo parent to /foo/bar and
// is foo parent to foo/bar. Does not convert paths to absolute, follow
« no previous file with comments | « no previous file | base/file_path.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698