| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/app_command.h" | 5 #include "chrome/installer/util/app_command.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/win/registry.h" | 8 #include "base/win/registry.h" |
| 9 #include "chrome/installer/util/google_update_constants.h" | 9 #include "chrome/installer/util/google_update_constants.h" |
| 10 #include "chrome/installer/util/work_item_list.h" | 10 #include "chrome/installer/util/work_item_list.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 DWORD sends_pings = 0; | 35 DWORD sends_pings = 0; |
| 36 DWORD is_web_acc = 0; | 36 DWORD is_web_acc = 0; |
| 37 | 37 |
| 38 result = key.ReadValue(google_update::kRegCommandLineField, &cmd_line); | 38 result = key.ReadValue(google_update::kRegCommandLineField, &cmd_line); |
| 39 if (result != ERROR_SUCCESS) { | 39 if (result != ERROR_SUCCESS) { |
| 40 LOG(WARNING) << "Error reading " << google_update::kRegCommandLineField | 40 LOG(WARNING) << "Error reading " << google_update::kRegCommandLineField |
| 41 << " value from registry: " << result; | 41 << " value from registry: " << result; |
| 42 return false; | 42 return false; |
| 43 } | 43 } |
| 44 | 44 |
| 45 result = key.ReadValueDW(google_update::kRegSendsPingsField, &sends_pings); | 45 result = key.ReadValue(google_update::kRegSendsPingsField, &sends_pings); |
| 46 if (result != ERROR_SUCCESS) { | 46 if (result != ERROR_SUCCESS) { |
| 47 LOG(WARNING) << "Error reading " << google_update::kRegSendsPingsField | 47 LOG(WARNING) << "Error reading " << google_update::kRegSendsPingsField |
| 48 << " value from registry: " << result; | 48 << " value from registry: " << result; |
| 49 return false; | 49 return false; |
| 50 } | 50 } |
| 51 | 51 |
| 52 result = key.ReadValueDW(google_update::kRegWebAccessibleField, &is_web_acc); | 52 result = key.ReadValue(google_update::kRegWebAccessibleField, &is_web_acc); |
| 53 if (result != ERROR_SUCCESS) { | 53 if (result != ERROR_SUCCESS) { |
| 54 LOG(WARNING) << "Error reading " << google_update::kRegWebAccessibleField | 54 LOG(WARNING) << "Error reading " << google_update::kRegWebAccessibleField |
| 55 << " value from registry: " << result; | 55 << " value from registry: " << result; |
| 56 return false; | 56 return false; |
| 57 } | 57 } |
| 58 | 58 |
| 59 command_line_.swap(cmd_line); | 59 command_line_.swap(cmd_line); |
| 60 sends_pings_ = (sends_pings != 0); | 60 sends_pings_ = (sends_pings != 0); |
| 61 is_web_accessible_ = (is_web_acc != 0); | 61 is_web_accessible_ = (is_web_acc != 0); |
| 62 | 62 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 79 google_update::kRegSendsPingsField, | 79 google_update::kRegSendsPingsField, |
| 80 sends_pings, true) | 80 sends_pings, true) |
| 81 ->set_log_message("setting quick-enable-cf SendsPings registry value"); | 81 ->set_log_message("setting quick-enable-cf SendsPings registry value"); |
| 82 item_list->AddSetRegValueWorkItem(predefined_root, command_path, | 82 item_list->AddSetRegValueWorkItem(predefined_root, command_path, |
| 83 google_update::kRegWebAccessibleField, | 83 google_update::kRegWebAccessibleField, |
| 84 is_web_accessible, true) | 84 is_web_accessible, true) |
| 85 ->set_log_message("setting quick-enable-cf WebAccessible registry value"); | 85 ->set_log_message("setting quick-enable-cf WebAccessible registry value"); |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace installer | 88 } // namespace installer |
| OLD | NEW |