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

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

Issue 410923002: Fix installer variable name bugaboo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | 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 ac9484deffc100b2f376998c81bbb4ce421f1255..146359fd05f1d4bc412ef31bddd62a705c045c54 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -442,12 +442,12 @@ DeleteResult DeleteUserDataDir(const base::FilePath& user_data_dir,
if (result == DELETE_REQUIRES_REBOOT) {
ScheduleParentAndGrandparentForDeletion(user_data_dir);
} else {
- const base::FilePath user_data_dir(user_data_dir.DirName());
- if (!user_data_dir.empty() &&
- DeleteEmptyDir(user_data_dir) == DELETE_SUCCEEDED) {
- const base::FilePath product_dir(user_data_dir.DirName());
- if (!product_dir.empty())
- DeleteEmptyDir(product_dir);
+ const base::FilePath product_dir1(user_data_dir.DirName());
+ if (!product_dir1.empty() &&
+ DeleteEmptyDir(product_dir1) == DELETE_SUCCEEDED) {
+ const base::FilePath product_dir2(product_dir1.DirName());
+ if (!product_dir2.empty())
+ DeleteEmptyDir(product_dir2);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698