OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/browser/component_updater/component_patcher_win.h" | 5 #include "chrome/browser/component_updater/component_patcher_win.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
13 #include "base/process_util.h" | 13 #include "base/process/kill.h" |
| 14 #include "base/process/launch.h" |
14 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
15 #include "base/win/scoped_handle.h" | 16 #include "base/win/scoped_handle.h" |
16 #include "chrome/installer/util/util_constants.h" | 17 #include "chrome/installer/util/util_constants.h" |
17 | 18 |
18 namespace { | 19 namespace { |
19 | 20 |
20 std::string PatchTypeToCommandLineSwitch( | 21 std::string PatchTypeToCommandLineSwitch( |
21 ComponentPatcher::PatchType patch_type) { | 22 ComponentPatcher::PatchType patch_type) { |
22 if (patch_type == ComponentPatcher::kPatchTypeCourgette) | 23 if (patch_type == ComponentPatcher::kPatchTypeCourgette) |
23 return std::string(installer::kCourgette); | 24 return std::string(installer::kCourgette); |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 !base::WaitForExitCode(ph, &exit_code)) { | 104 !base::WaitForExitCode(ph, &exit_code)) { |
104 *error = GetLastError(); | 105 *error = GetLastError(); |
105 return ComponentUnpacker::kDeltaPatchProcessFailure; | 106 return ComponentUnpacker::kDeltaPatchProcessFailure; |
106 } | 107 } |
107 | 108 |
108 *error = exit_code; | 109 *error = exit_code; |
109 return *error ? ComponentUnpacker::kDeltaOperationFailure : | 110 return *error ? ComponentUnpacker::kDeltaOperationFailure : |
110 ComponentUnpacker::kNone; | 111 ComponentUnpacker::kNone; |
111 } | 112 } |
112 | 113 |
OLD | NEW |