| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 // See the corresponding header file for description of the functions in this | 5 // See the corresponding header file for description of the functions in this |
| 6 // file. | 6 // file. |
| 7 | 7 |
| 8 #include "chrome/installer/util/install_util.h" | 8 #include "chrome/installer/util/install_util.h" |
| 9 | 9 |
| 10 #include <shellapi.h> | 10 #include <shellapi.h> |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 } else { | 228 } else { |
| 229 LOG(ERROR) << "Could not write msi value to client state key."; | 229 LOG(ERROR) << "Could not write msi value to client state key."; |
| 230 } | 230 } |
| 231 } else { | 231 } else { |
| 232 LOG(ERROR) << "Could not open client state key!"; | 232 LOG(ERROR) << "Could not open client state key!"; |
| 233 } | 233 } |
| 234 | 234 |
| 235 return success; | 235 return success; |
| 236 } | 236 } |
| 237 | 237 |
| 238 | |
| 239 bool InstallUtil::BuildDLLRegistrationList(const std::wstring& install_path, | 238 bool InstallUtil::BuildDLLRegistrationList(const std::wstring& install_path, |
| 240 const wchar_t** const dll_names, | 239 const wchar_t** const dll_names, |
| 241 int dll_names_count, | 240 int dll_names_count, |
| 242 bool do_register, | 241 bool do_register, |
| 243 WorkItemList* registration_list) { | 242 WorkItemList* registration_list) { |
| 244 DCHECK(NULL != registration_list); | 243 DCHECK(NULL != registration_list); |
| 245 bool success = true; | 244 bool success = true; |
| 246 for (int i = 0; i < dll_names_count; i++) { | 245 for (int i = 0; i < dll_names_count; i++) { |
| 247 std::wstring dll_file_path(install_path); | 246 std::wstring dll_file_path(install_path); |
| 248 file_util::AppendToPath(&dll_file_path, dll_names[i]); | 247 file_util::AppendToPath(&dll_file_path, dll_names[i]); |
| 249 success = registration_list->AddSelfRegWorkItem(dll_file_path, | 248 success = registration_list->AddSelfRegWorkItem(dll_file_path, |
| 250 do_register) && success; | 249 do_register) && success; |
| 251 } | 250 } |
| 252 return (dll_names_count > 0) && success; | 251 return (dll_names_count > 0) && success; |
| 253 } | 252 } |
| OLD | NEW |