| Index: chrome/installer/util/copy_tree_work_item.h
|
| ===================================================================
|
| --- chrome/installer/util/copy_tree_work_item.h (revision 29088)
|
| +++ chrome/installer/util/copy_tree_work_item.h (working copy)
|
| @@ -7,6 +7,8 @@
|
|
|
| #include <string>
|
| #include <windows.h>
|
| +
|
| +#include "base/file_path.h"
|
| #include "chrome/installer/util/work_item.h"
|
|
|
| // A WorkItem subclass that recursively copies a file system hierarchy from
|
| @@ -40,20 +42,20 @@
|
| const std::wstring& alternative_path);
|
|
|
| // Checks if the path specified is in use (and hence can not be deleted)
|
| - bool IsFileInUse(const std::wstring& path);
|
| + bool IsFileInUse(const FilePath& path);
|
|
|
| // Get a backup path that can keep the original files under dest_path_,
|
| // and set backup_path_ with the result.
|
| bool GetBackupPath();
|
|
|
| // Source path to copy files from.
|
| - std::wstring source_path_;
|
| + FilePath source_path_;
|
|
|
| // Destination path to copy files to.
|
| - std::wstring dest_path_;
|
| + FilePath dest_path_;
|
|
|
| // Temporary directory that can be used.
|
| - std::wstring temp_dir_;
|
| + FilePath temp_dir_;
|
|
|
| // Controls the behavior for overwriting.
|
| CopyOverWriteOption overwrite_option_;
|
| @@ -61,7 +63,7 @@
|
| // If overwrite_option_ = NEW_NAME_IF_IN_USE, this variables stores the path
|
| // to be used if the file is in use and hence we want to copy it to a
|
| // different path.
|
| - std::wstring alternative_path_;
|
| + FilePath alternative_path_;
|
|
|
| // Whether the source was copied to dest_path_
|
| bool copied_to_dest_path_;
|
| @@ -76,7 +78,7 @@
|
|
|
| // The full path in temporary directory that the original dest_path_ has
|
| // been moved to.
|
| - std::wstring backup_path_;
|
| + FilePath backup_path_;
|
| };
|
|
|
| #endif // CHROME_INSTALLER_UTIL_COPY_TREE_WORK_ITEM_H_
|
|
|