| OLD | NEW |
| 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 "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "chrome/installer/util/create_dir_work_item.h" | 7 #include "chrome/installer/util/create_dir_work_item.h" |
| 8 #include "chrome/installer/util/logging_installer.h" | 8 #include "chrome/installer/util/logging_installer.h" |
| 9 | 9 |
| 10 CreateDirWorkItem::~CreateDirWorkItem() { | 10 CreateDirWorkItem::~CreateDirWorkItem() { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 return; | 29 return; |
| 30 } | 30 } |
| 31 | 31 |
| 32 bool CreateDirWorkItem::Do() { | 32 bool CreateDirWorkItem::Do() { |
| 33 VLOG(1) << "creating directory " << path_.value(); | 33 VLOG(1) << "creating directory " << path_.value(); |
| 34 GetTopDirToCreate(); | 34 GetTopDirToCreate(); |
| 35 if (top_path_.empty()) | 35 if (top_path_.empty()) |
| 36 return true; | 36 return true; |
| 37 | 37 |
| 38 VLOG(1) << "top directory that needs to be created: " << top_path_.value(); | 38 VLOG(1) << "top directory that needs to be created: " << top_path_.value(); |
| 39 bool result = file_util::CreateDirectory(path_); | 39 bool result = base::CreateDirectory(path_); |
| 40 VLOG(1) << "directory creation result: " << result; | 40 VLOG(1) << "directory creation result: " << result; |
| 41 | 41 |
| 42 rollback_needed_ = true; | 42 rollback_needed_ = true; |
| 43 | 43 |
| 44 return result; | 44 return result; |
| 45 } | 45 } |
| 46 | 46 |
| 47 void CreateDirWorkItem::Rollback() { | 47 void CreateDirWorkItem::Rollback() { |
| 48 if (!rollback_needed_) | 48 if (!rollback_needed_) |
| 49 return; | 49 return; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 60 if (!RemoveDirectory(path_to_delete.value().c_str())) | 60 if (!RemoveDirectory(path_to_delete.value().c_str())) |
| 61 break; | 61 break; |
| 62 } | 62 } |
| 63 if (path_to_delete == top_path_) | 63 if (path_to_delete == top_path_) |
| 64 break; | 64 break; |
| 65 path_to_delete = path_to_delete.DirName(); | 65 path_to_delete = path_to_delete.DirName(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 return; | 68 return; |
| 69 } | 69 } |
| OLD | NEW |