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

Unified Diff: chrome/installer/util/delete_after_reboot_helper.cc

Issue 12294008: Fix more remaining FilePath -> base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: chrome/installer/util/delete_after_reboot_helper.cc
diff --git a/chrome/installer/util/delete_after_reboot_helper.cc b/chrome/installer/util/delete_after_reboot_helper.cc
index e21d6e515f851141c13af185aadddedd85051f31..cc76b0e69afa30a4366a9fbb659f4e28efa3b11b 100644
--- a/chrome/installer/util/delete_after_reboot_helper.cc
+++ b/chrome/installer/util/delete_after_reboot_helper.cc
@@ -62,7 +62,7 @@ bool ScheduleFileSystemEntityForDeletion(const wchar_t* path) {
}
DWORD flags = MOVEFILE_DELAY_UNTIL_REBOOT;
- if (!file_util::DirectoryExists(FilePath::FromWStringHack(path))) {
+ if (!file_util::DirectoryExists(base::FilePath::FromWStringHack(path))) {
// This flag valid only for files
flags |= MOVEFILE_REPLACE_EXISTING;
}
@@ -116,9 +116,9 @@ bool ScheduleDirectoryForDeletion(const wchar_t* dir_name) {
// First schedule all the normal files for deletion.
{
bool success = true;
- file_util::FileEnumerator file_enum(FilePath(dir_name), false,
+ file_util::FileEnumerator file_enum(base::FilePath(dir_name), false,
file_util::FileEnumerator::FILES);
- for (FilePath file = file_enum.Next(); !file.empty();
+ for (base::FilePath file = file_enum.Next(); !file.empty();
file = file_enum.Next()) {
success = ScheduleFileSystemEntityForDeletion(file.value().c_str());
if (!success) {
@@ -131,9 +131,9 @@ bool ScheduleDirectoryForDeletion(const wchar_t* dir_name) {
// Then recurse to all the subdirectories.
{
bool success = true;
- file_util::FileEnumerator dir_enum(FilePath(dir_name), false,
+ file_util::FileEnumerator dir_enum(base::FilePath(dir_name), false,
file_util::FileEnumerator::DIRECTORIES);
- for (FilePath sub_dir = dir_enum.Next(); !sub_dir.empty();
+ for (base::FilePath sub_dir = dir_enum.Next(); !sub_dir.empty();
sub_dir = dir_enum.Next()) {
success = ScheduleDirectoryForDeletion(sub_dir.value().c_str());
if (!success) {
« no previous file with comments | « chrome/installer/launcher_support/chrome_launcher_support.cc ('k') | cloud_print/service/win/chrome_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698