Chromium Code Reviews| Index: chrome/installer/util/google_update_util.cc |
| diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc |
| index 980664194a54ae16815bf6f92f2f3656ac357262..81d100b0a77e49fe797eab946a2a93c47b57b891 100644 |
| --- a/chrome/installer/util/google_update_util.cc |
| +++ b/chrome/installer/util/google_update_util.cc |
| @@ -41,9 +41,9 @@ bool IsGoogleUpdatePresent(bool system_install) { |
| return GoogleUpdateSettings::GetGoogleUpdateVersion(system_install).IsValid(); |
| } |
| -// Returns GoogleUpdateSetup.exe's executable path at specified level. |
| +// Returns GoogleUpdate.exe's executable path at specified level. |
| // or an empty path if none is found. |
| -FilePath GetGoogleUpdateSetupExe(bool system_install) { |
| +FilePath GetGoogleUpdateExe(bool system_install) { |
| const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
| RegKey update_key; |
| @@ -51,11 +51,8 @@ FilePath GetGoogleUpdateSetupExe(bool system_install) { |
| ERROR_SUCCESS) { |
| string16 path_str; |
| string16 version_str; |
|
grt (UTC plus 2)
2013/02/12 18:31:56
unused
|
| - if ((update_key.ReadValue(kRegPathField, &path_str) == ERROR_SUCCESS) && |
| - (update_key.ReadValue(kRegGoogleUpdateVersion, &version_str) == |
| - ERROR_SUCCESS)) { |
| - return base::FilePath(path_str).DirName().Append(version_str). |
| - Append(kGoogleUpdateSetupExe); |
| + if ((update_key.ReadValue(kRegPathField, &path_str) == ERROR_SUCCESS)) { |
|
grt (UTC plus 2)
2013/02/12 18:31:56
nit: no braces
|
| + return base::FilePath(path_str); |
| } |
| } |
| return base::FilePath(); |
| @@ -66,10 +63,9 @@ FilePath GetGoogleUpdateSetupExe(bool system_install) { |
| // Otherwise, clears |cmd_string| and returns false. |
| bool GetUserLevelGoogleUpdateInstallCommandLine(string16* cmd_string) { |
| cmd_string->clear(); |
| - base::FilePath google_update_setup( |
| - GetGoogleUpdateSetupExe(true)); // system-level. |
| - if (!google_update_setup.empty()) { |
| - CommandLine cmd(google_update_setup); |
| + base::FilePath google_update_exe(GetGoogleUpdateExe(true)); // system-level. |
| + if (!google_update_exe.empty()) { |
| + CommandLine cmd(google_update_exe); |
| // Appends parameter "/install runtime=true&needsadmin=false /silent" |
| // Constants are found in code.google.com/p/omaha/common/const_cmd_line.h. |
| cmd.AppendArg("/install"); |