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

Side by Side Diff: chrome/installer/util/copy_tree_work_item.cc

Issue 16950028: Move file_util::Delete to the base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/installer/util/copy_tree_work_item.h" 5 #include "chrome/installer/util/copy_tree_work_item.h"
6 6
7 #include <shlwapi.h> 7 #include <shlwapi.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 return true; 103 return true;
104 } 104 }
105 105
106 void CopyTreeWorkItem::Rollback() { 106 void CopyTreeWorkItem::Rollback() {
107 // Normally the delete operations below should not fail unless some 107 // Normally the delete operations below should not fail unless some
108 // programs like anti-virus are inspecting the files we just copied. 108 // programs like anti-virus are inspecting the files we just copied.
109 // If this does happen sometimes, we may consider using Move instead of 109 // If this does happen sometimes, we may consider using Move instead of
110 // Delete here. For now we just log the error and continue with the 110 // Delete here. For now we just log the error and continue with the
111 // rest of rollback operation. 111 // rest of rollback operation.
112 if (copied_to_dest_path_ && !file_util::Delete(dest_path_, true)) { 112 if (copied_to_dest_path_ && !base::Delete(dest_path_, true)) {
113 LOG(ERROR) << "Can not delete " << dest_path_.value(); 113 LOG(ERROR) << "Can not delete " << dest_path_.value();
114 } 114 }
115 if (moved_to_backup_) { 115 if (moved_to_backup_) {
116 base::FilePath backup(backup_path_.path().Append(dest_path_.BaseName())); 116 base::FilePath backup(backup_path_.path().Append(dest_path_.BaseName()));
117 if (!file_util::Move(backup, dest_path_)) { 117 if (!file_util::Move(backup, dest_path_)) {
118 LOG(ERROR) << "failed move " << backup.value() 118 LOG(ERROR) << "failed move " << backup.value()
119 << " to " << dest_path_.value(); 119 << " to " << dest_path_.value();
120 } 120 }
121 } 121 }
122 if (copied_to_alternate_path_ && 122 if (copied_to_alternate_path_ &&
123 !file_util::Delete(alternative_path_, true)) { 123 !base::Delete(alternative_path_, true)) {
124 LOG(ERROR) << "Can not delete " << alternative_path_.value(); 124 LOG(ERROR) << "Can not delete " << alternative_path_.value();
125 } 125 }
126 } 126 }
127 127
128 bool CopyTreeWorkItem::IsFileInUse(const base::FilePath& path) { 128 bool CopyTreeWorkItem::IsFileInUse(const base::FilePath& path) {
129 if (!file_util::PathExists(path)) 129 if (!file_util::PathExists(path))
130 return false; 130 return false;
131 131
132 HANDLE handle = ::CreateFile(path.value().c_str(), FILE_ALL_ACCESS, 132 HANDLE handle = ::CreateFile(path.value().c_str(), FILE_ALL_ACCESS,
133 NULL, NULL, OPEN_EXISTING, NULL, NULL); 133 NULL, NULL, OPEN_EXISTING, NULL, NULL);
134 if (handle == INVALID_HANDLE_VALUE) 134 if (handle == INVALID_HANDLE_VALUE)
135 return true; 135 return true;
136 136
137 CloseHandle(handle); 137 CloseHandle(handle);
138 return false; 138 return false;
139 } 139 }
OLDNEW
« no previous file with comments | « chrome/installer/tools/validate_installation_main.cc ('k') | chrome/installer/util/copy_tree_work_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698