diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 21:03:32 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 21:03:32 +0000 |
| commit | 946d3f4a8830a493dec0d1f58d73d7b8ea5d695b (patch) | |
| tree | 8a1725731bac844e051f9521b6d29cbbcccbf243 /chrome/installer | |
| parent | 8b10b336067fe897c823b8d87aaf44a60247d4b3 (diff) | |
| download | chromium_src-946d3f4a8830a493dec0d1f58d73d7b8ea5d695b.zip chromium_src-946d3f4a8830a493dec0d1f58d73d7b8ea5d695b.tar.gz chromium_src-946d3f4a8830a493dec0d1f58d73d7b8ea5d695b.tar.bz2 | |
Adding fallback to LaunchGoogleChrome in case Omaha process launcher is not registered.
BUG=114377
TEST=NONE
Review URL: http://codereview.chromium.org/9474039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/gcapi/gcapi.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index 4abe39b..8d0f6d1 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -24,6 +24,7 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/time.h" #include "base/win/registry.h" @@ -464,6 +465,12 @@ BOOL __stdcall LaunchGoogleChrome() { if (SUCCEEDED(ipl->LaunchCmdLine(chrome_exe_path.value().c_str()))) ret = true; ipl.Release(); + } else { + // Couldn't get Omaha's process launcher, Omaha may not be installed at + // system level. Try just running Chrome instead. + ret = base::LaunchProcess(chrome_exe_path.value(), + base::LaunchOptions(), + NULL); } if (impersonation_success) |