diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-17 19:36:03 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-17 19:36:03 +0000 |
| commit | aaa6df4d3d1931eec2235902f791f4e414cd09e8 (patch) | |
| tree | 9552421ac5000a541b897508e4e73fd33325a587 /base/file_util_mac.mm | |
| parent | 6beee703776760481ae8fd9784e571ea324d464d (diff) | |
| download | chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.zip chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.tar.gz chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.tar.bz2 | |
Disable "using base::FilePath" on Linux since it now compiles.
This keeps the using for other platforms temporarily. This patch is to "stop
the bleeding" since new conflicts are added every day. The other platforms will
be fixed in followup patches.
This also adds an exception for the MTPD code which has a circular dependency
on FilePath.
Review URL: https://codereview.chromium.org/12282019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_mac.mm')
| -rw-r--r-- | base/file_util_mac.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/file_util_mac.mm b/base/file_util_mac.mm index 2499f44..0de3786 100644 --- a/base/file_util_mac.mm +++ b/base/file_util_mac.mm @@ -15,7 +15,7 @@ namespace file_util { -bool GetTempDir(FilePath* path) { +bool GetTempDir(base::FilePath* path) { NSString* tmp = NSTemporaryDirectory(); if (tmp == nil) return false; @@ -23,11 +23,12 @@ bool GetTempDir(FilePath* path) { return true; } -bool GetShmemTempDir(FilePath* path, bool executable) { +bool GetShmemTempDir(base::FilePath* path, bool executable) { return GetTempDir(path); } -bool CopyFileUnsafe(const FilePath& from_path, const FilePath& to_path) { +bool CopyFileUnsafe(const base::FilePath& from_path, + const base::FilePath& to_path) { base::ThreadRestrictions::AssertIOAllowed(); return (copyfile(from_path.value().c_str(), to_path.value().c_str(), NULL, COPYFILE_ALL) == 0); |