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

Unified Diff: chrome/installer/util/delete_tree_work_item.h

Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 2 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 | « chrome/installer/util/delete_after_reboot_helper.cc ('k') | chrome/installer/util/delete_tree_work_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/delete_tree_work_item.h
===================================================================
--- chrome/installer/util/delete_tree_work_item.h (revision 29084)
+++ chrome/installer/util/delete_tree_work_item.h (working copy)
@@ -7,8 +7,6 @@
#include <string>
#include <windows.h>
-
-#include "base/file_path.h"
#include "chrome/installer/util/work_item.h"
// A WorkItem subclass that recursively deletes a file system hierarchy at the
@@ -28,25 +26,25 @@
friend class WorkItem;
// Get a backup path that can keep root_path_ or key_path_
- bool GetBackupPath(const FilePath& for_path, FilePath* backup_path);
+ bool GetBackupPath(const std::wstring& for_path, std::wstring* backup_path);
DeleteTreeWorkItem(const std::wstring& root_path,
const std::wstring& key_path);
// Root path to delete.
- FilePath root_path_;
+ std::wstring root_path_;
// Path to the key file. If the key file is specified, deletion will be
// performed only if the key file is not in use.
- FilePath key_path_;
+ std::wstring key_path_;
// The full path in temporary directory that the original root_path_ has
// been moved to.
- FilePath backup_path_;
+ std::wstring backup_path_;
// The full path in temporary directory that the original key_path_ has
// been moved to.
- FilePath key_backup_path_;
+ std::wstring key_backup_path_;
};
#endif // CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_
« no previous file with comments | « chrome/installer/util/delete_after_reboot_helper.cc ('k') | chrome/installer/util/delete_tree_work_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698