diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 18:43:58 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 18:43:58 +0000 |
| commit | 072d5850bac0755023b314110c27480c6963e477 (patch) | |
| tree | bfa811fdd06eaaefac11e56f4805343646b2d339 /chrome/installer/setup | |
| parent | c1598d54e9219ac1766437cf838b401880cfaac4 (diff) | |
| download | chromium_src-072d5850bac0755023b314110c27480c6963e477.zip chromium_src-072d5850bac0755023b314110c27480c6963e477.tar.gz chromium_src-072d5850bac0755023b314110c27480c6963e477.tar.bz2 | |
Add 64-bit binaries that are required for NaCl support to Chrome installation on Windows.
NaCl uses two additional binaries on 64-bit Windows: nacl64.exe and nacl64.dll, so these binaries need to be installed and updated as part of Chrome installation/update.
Review URL: http://codereview.chromium.org/567028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index 7ae3b77..d957ecc 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -47,6 +47,8 @@ void CloseAllChromeProcesses() { (GetLastError() == ERROR_TIMEOUT)) { base::CleanupProcesses(installer_util::kChromeExe, 0, ResultCodes::HUNG, NULL); + base::CleanupProcesses(installer_util::kNaClExe, 0, + ResultCodes::HUNG, NULL); return; } } @@ -57,6 +59,8 @@ void CloseAllChromeProcesses() { // messages. base::CleanupProcesses(installer_util::kChromeExe, 15000, ResultCodes::HUNG, NULL); + base::CleanupProcesses(installer_util::kNaClExe, 15000, + ResultCodes::HUNG, NULL); } // This method tries to figure out if current user has registered Chrome. |