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

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

Issue 6377011: wstring: use a few more FilePaths to remove Hack functions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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/copy_tree_work_item_unittest.cc ('k') | chrome/installer/util/work_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/work_item.h
diff --git a/chrome/installer/util/work_item.h b/chrome/installer/util/work_item.h
index 7fd5db23340a2d2613d6e626d9b26f769bec2618..93ff993a18b42d41987b69c49f07bad7ac274eac 100644
--- a/chrome/installer/util/work_item.h
+++ b/chrome/installer/util/work_item.h
@@ -16,6 +16,8 @@
#include <vector>
#include "base/basictypes.h"
+// TODO: forward declare FilePath once default argument is removed below.
+#include "base/file_path.h"
class CopyTreeWorkItem;
class CreateDirWorkItem;
@@ -23,7 +25,6 @@ class CreateRegKeyWorkItem;
class DeleteTreeWorkItem;
class DeleteRegKeyWorkItem;
class DeleteRegValueWorkItem;
-class FilePath;
class MoveTreeWorkItem;
class SelfRegWorkItem;
class SetRegValueWorkItem;
@@ -59,11 +60,12 @@ class WorkItem {
// * If overwrite_option is NEW_NAME_IF_IN_USE, file is copied with an
// alternate name specified by alternative_path.
static CopyTreeWorkItem* CreateCopyTreeWorkItem(
- const std::wstring& source_path,
- const std::wstring& dest_path,
- const std::wstring& temp_dir,
+ const FilePath& source_path,
+ const FilePath& dest_path,
+ const FilePath& temp_dir,
CopyOverWriteOption overwrite_option,
- const std::wstring& alternative_path = L"");
+ // TODO(amit): default args are disallowed by style guide.
+ const FilePath& alternative_path = FilePath());
Avi (use Gerrit) 2011/01/26 22:00:31 How many callers does this have? Can you just fix
// Create a CreateDirWorkItem that creates a directory at the given path.
static CreateDirWorkItem* CreateCreateDirWorkItem(const FilePath& path);
« no previous file with comments | « chrome/installer/util/copy_tree_work_item_unittest.cc ('k') | chrome/installer/util/work_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698