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

Side by Side Diff: chrome/installer/util/move_tree_work_item.h

Issue 2379543002: installer and some misc files: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Fix compilation failure Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ 5 #ifndef CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_
6 #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ 6 #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Source path to move files from. 50 // Source path to move files from.
51 base::FilePath source_path_; 51 base::FilePath source_path_;
52 52
53 // Destination path to move files to. 53 // Destination path to move files to.
54 base::FilePath dest_path_; 54 base::FilePath dest_path_;
55 55
56 // Temporary directory to backup dest_path_ (if it already exists). 56 // Temporary directory to backup dest_path_ (if it already exists).
57 base::FilePath temp_dir_; 57 base::FilePath temp_dir_;
58 58
59 // The temporary directory into which the original dest_path_ has been moved. 59 // The temporary directory into which the original dest_path_ has been moved.
60 base::ScopedTempDir backup_path_; 60 base::ScopedTempDir backup_dir_;
61
62 // The path to |backup_dir_| or empty if |backup_dir_| has not been created.
63 base::FilePath backup_path_;
vabr (Chromium) 2016/09/28 13:10:24 Another instance of the change done to copy_tree_w
61 64
62 // Whether the source was moved to dest_path_ 65 // Whether the source was moved to dest_path_
63 bool moved_to_dest_path_; 66 bool moved_to_dest_path_;
64 67
65 // Whether the original files have been moved to backup path under 68 // Whether the original files have been moved to backup path under
66 // temporary directory. If true, moving back is needed during rollback. 69 // temporary directory. If true, moving back is needed during rollback.
67 bool moved_to_backup_; 70 bool moved_to_backup_;
68 71
69 // Whether we moved the source files to the backup path instead just to 72 // Whether we moved the source files to the backup path instead just to
70 // preserve the behaviour of a Move. This can only become true if 73 // preserve the behaviour of a Move. This can only become true if
71 // duplicate_option_ is CHECK_DUPLICATES. 74 // duplicate_option_ is CHECK_DUPLICATES.
72 bool source_moved_to_backup_; 75 bool source_moved_to_backup_;
73 76
74 // Whether to check for duplicates before moving. 77 // Whether to check for duplicates before moving.
75 MoveTreeOption duplicate_option_; 78 MoveTreeOption duplicate_option_;
76 }; 79 };
77 80
78 #endif // CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ 81 #endif // CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698