diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:40:12 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:40:12 +0000 |
| commit | b33f1d943fd420857d9c5988ce1f4598f9a8765a (patch) | |
| tree | 8bb2ca934346bb21198ca95c5294d15643181662 /chrome/installer | |
| parent | c06f3007c6f5f565501d33343de89c229f356e7a (diff) | |
| download | chromium_src-b33f1d943fd420857d9c5988ce1f4598f9a8765a.zip chromium_src-b33f1d943fd420857d9c5988ce1f4598f9a8765a.tar.gz chromium_src-b33f1d943fd420857d9c5988ce1f4598f9a8765a.tar.bz2 | |
file_util: Convert the wstring version of IsDirectoryEmpty to FilePath.
BUG=24672
TEST=compiles
Review URL: http://codereview.chromium.org/2153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index 4338cb6..fe3754b 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -142,15 +142,14 @@ bool ScheduleParentAndGrandparentForDeletion(const FilePath& path) { bool DeleteEmptyParentDir(const FilePath& path) { bool ret = true; FilePath parent_dir = path.DirName(); - if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir.value())) { + if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir)) { if (!file_util::Delete(parent_dir, true)) { ret = false; LOG(ERROR) << "Failed to delete folder: " << parent_dir.value(); } parent_dir = parent_dir.DirName(); - if (!parent_dir.empty() && - file_util::IsDirectoryEmpty(parent_dir.value())) { + if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir)) { if (!file_util::Delete(parent_dir, true)) { ret = false; LOG(ERROR) << "Failed to delete folder: " << parent_dir.value(); |