diff options
| author | Alexei Svitkine <asvitkine@chromium.org> | 2021-11-16 22:01:32 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-11-16 14:09:10 -0800 |
| commit | 261f4df0801de80106dd28a47914131c9b897058 (patch) | |
| tree | b65f66e91da145f35a2d240a8ea1a41eb20c892d /zucchini_integration.cc | |
| parent | 8bb965d29e918d0559589a215ff7f4bd0874bc08 (diff) | |
| download | zucchini-261f4df0801de80106dd28a47914131c9b897058.tar.gz | |
Update callsites to use WIN_-prefixed base::File flags.
The flags have been renamed to make it clear that they only
apply to Windows (see associated bug).
If you're reviewing this CL, please verify your code's usage
of the flag to ensure that the behavior is as intended. Thanks!
This CL was uploaded by git cl split.
R=huangs@chromium.org
Bug: 1244149
Change-Id: I08d4f6e886a699d852470e08025edb85b0a695ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3279224
Auto-Submit: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/main@{#942295}
NOKEYCHECK=True
GitOrigin-RevId: 9f7f7c8f781c5b7946dc9be3f80cc28cda9e971c
Diffstat (limited to 'zucchini_integration.cc')
| -rw-r--r-- | zucchini_integration.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/zucchini_integration.cc b/zucchini_integration.cc index bf28b3c..c654a08 100644 --- a/zucchini_integration.cc +++ b/zucchini_integration.cc @@ -184,11 +184,12 @@ status::Code Generate(const base::FilePath& old_path, std::string imposed_matches) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File new_file(new_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File patch_file(patch_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ | - File::FLAG_WRITE | File::FLAG_SHARE_DELETE | + File::FLAG_WRITE | + File::FLAG_WIN_SHARE_DELETE | File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, new_path, patch_path); return GenerateCommon(std::move(old_file), std::move(new_file), @@ -211,11 +212,11 @@ status::Code Apply(const base::FilePath& old_path, bool force_keep) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File patch_file(patch_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File new_file(new_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ | - File::FLAG_WRITE | File::FLAG_SHARE_DELETE | + File::FLAG_WRITE | File::FLAG_WIN_SHARE_DELETE | File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, new_path, patch_path); return ApplyCommon(std::move(old_file), std::move(patch_file), |