| 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 // This file defines specific implementation of BrowserDistribution class for | 5 // This file defines specific implementation of BrowserDistribution class for |
| 6 // Google Chrome. | 6 // Google Chrome. |
| 7 | 7 |
| 8 #include "chrome/installer/util/google_chrome_distribution.h" | 8 #include "chrome/installer/util/google_chrome_distribution.h" |
| 9 | 9 |
| 10 #include <atlbase.h> | 10 #include <atlbase.h> |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 return key; | 225 return key; |
| 226 } | 226 } |
| 227 | 227 |
| 228 std::wstring GoogleChromeDistribution::GetUninstallLinkName() { | 228 std::wstring GoogleChromeDistribution::GetUninstallLinkName() { |
| 229 const std::wstring& link_name = | 229 const std::wstring& link_name = |
| 230 installer_util::GetLocalizedString(IDS_UNINSTALL_CHROME_BASE); | 230 installer_util::GetLocalizedString(IDS_UNINSTALL_CHROME_BASE); |
| 231 return link_name; | 231 return link_name; |
| 232 } | 232 } |
| 233 | 233 |
| 234 std::wstring GoogleChromeDistribution::GetUninstallRegPath() { | 234 std::wstring GoogleChromeDistribution::GetUninstallRegPath() { |
| 235 return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrom
e"; | 235 return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" |
| 236 L"Google Chrome"; |
| 236 } | 237 } |
| 237 | 238 |
| 238 std::wstring GoogleChromeDistribution::GetVersionKey() { | 239 std::wstring GoogleChromeDistribution::GetVersionKey() { |
| 239 std::wstring key(google_update::kRegPathClients); | 240 std::wstring key(google_update::kRegPathClients); |
| 240 key.append(L"\\"); | 241 key.append(L"\\"); |
| 241 key.append(google_update::kChromeGuid); | 242 key.append(google_update::kChromeGuid); |
| 242 return key; | 243 return key; |
| 243 } | 244 } |
| 244 | 245 |
| 245 // This method checks if we need to change "ap" key in Google Update to try | 246 // This method checks if we need to change "ap" key in Google Update to try |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 | 280 |
| 280 std::wstring new_value = GoogleChromeDistribution::GetNewGoogleUpdateApKey( | 281 std::wstring new_value = GoogleChromeDistribution::GetNewGoogleUpdateApKey( |
| 281 incremental_install, install_status, ap_key_value); | 282 incremental_install, install_status, ap_key_value); |
| 282 if ((new_value.compare(ap_key_value) != 0) && | 283 if ((new_value.compare(ap_key_value) != 0) && |
| 283 !key.WriteValue(google_update::kRegApField, new_value.c_str())) { | 284 !key.WriteValue(google_update::kRegApField, new_value.c_str())) { |
| 284 LOG(ERROR) << "Failed to write value " << new_value | 285 LOG(ERROR) << "Failed to write value " << new_value |
| 285 << " to the registry field " << google_update::kRegApField; | 286 << " to the registry field " << google_update::kRegApField; |
| 286 } | 287 } |
| 287 key.Close(); | 288 key.Close(); |
| 288 } | 289 } |
| OLD | NEW |