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

Unified Diff: chrome/installer/setup/uninstall.cc

Issue 2153002: file_util: Convert the wstring version of IsDirectoryEmpty to FilePath. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: fix nit Created 10 years, 7 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 | « base/file_util_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 4338cb636a1c47709af05532ed2c66a2b9b0893a..fe3754b1c173d9afa093e8039b3720ed12ad023a 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();
« no previous file with comments | « base/file_util_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698