summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/delete_after_reboot_helper.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 23:31:35 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 23:31:35 +0000
commit85f9d0bc7f09e87a72deb4722466023cc777ee27 (patch)
tree41d4eede299bcdc8660934baa955d41c8b724709 /chrome/installer/util/delete_after_reboot_helper.cc
parent6ebfda42437a3ac3d27949a948f9d643bbcc146f (diff)
downloadchromium_src-85f9d0bc7f09e87a72deb4722466023cc777ee27.zip
chromium_src-85f9d0bc7f09e87a72deb4722466023cc777ee27.tar.gz
chromium_src-85f9d0bc7f09e87a72deb4722466023cc777ee27.tar.bz2
Correctly schedule empty parent directories for deletion when Chrome Frame is uninstalled while in use.
BUG=27483,23999 TEST=Uninstall Chrome Frame while it is in use. Verify that all Chrome Frame folders are removed. Review URL: http://codereview.chromium.org/392013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/delete_after_reboot_helper.cc')
-rw-r--r--chrome/installer/util/delete_after_reboot_helper.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/util/delete_after_reboot_helper.cc b/chrome/installer/util/delete_after_reboot_helper.cc
index 1bc322c..6806f78 100644
--- a/chrome/installer/util/delete_after_reboot_helper.cc
+++ b/chrome/installer/util/delete_after_reboot_helper.cc
@@ -54,6 +54,8 @@ bool IsSafeDirectoryNameForDeletion(const wchar_t* dir_name) {
return ok;
}
+} // end namespace
+
// Must only be called for regular files or directories that will be empty.
bool ScheduleFileSystemEntityForDeletion(const wchar_t* path) {
// Check if the file exists, return false if not.
@@ -77,7 +79,6 @@ bool ScheduleFileSystemEntityForDeletion(const wchar_t* path) {
LOG(INFO) << "Scheduled for deletion: " << path;
return true;
}
-} // end namespace
bool ScheduleDirectoryForDeletion(const wchar_t* dir_name) {
if (!IsSafeDirectoryNameForDeletion(dir_name)) {