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

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

Issue 2725007: Reverting this as it caused installer_unit_tests to fail. Please fix and rela... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
238 bool InstallUtil::BuildDLLRegistrationList(const std::wstring& install_path, 239 bool InstallUtil::BuildDLLRegistrationList(const std::wstring& install_path,
239 const wchar_t** const dll_names, 240 const wchar_t** const dll_names,
240 int dll_names_count, 241 int dll_names_count,
241 bool do_register, 242 bool do_register,
242 WorkItemList* registration_list) { 243 WorkItemList* registration_list) {
243 DCHECK(NULL != registration_list); 244 DCHECK(NULL != registration_list);
244 bool success = true; 245 bool success = true;
245 for (int i = 0; i < dll_names_count; i++) { 246 for (int i = 0; i < dll_names_count; i++) {
246 std::wstring dll_file_path(install_path); 247 std::wstring dll_file_path(install_path);
247 file_util::AppendToPath(&dll_file_path, dll_names[i]); 248 file_util::AppendToPath(&dll_file_path, dll_names[i]);
(...skipping 25 matching lines...) Expand all
273 const std::wstring& value_name) { 274 const std::wstring& value_name) {
274 RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS); 275 RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS);
275 LOG(INFO) << "Deleting registry value " << value_name; 276 LOG(INFO) << "Deleting registry value " << value_name;
276 if (key.ValueExists(value_name.c_str()) && 277 if (key.ValueExists(value_name.c_str()) &&
277 !key.DeleteValue(value_name.c_str())) { 278 !key.DeleteValue(value_name.c_str())) {
278 LOG(ERROR) << "Failed to delete registry value: " << value_name; 279 LOG(ERROR) << "Failed to delete registry value: " << value_name;
279 return false; 280 return false;
280 } 281 }
281 return true; 282 return true;
282 } 283 }
OLDNEW
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698