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 <windows.h> | 5 #include <windows.h> |
6 #include <msi.h> | 6 #include <msi.h> |
7 #include <shellapi.h> | 7 #include <shellapi.h> |
8 #include <shlobj.h> | 8 #include <shlobj.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 installer_state->FindProduct(BrowserDistribution::CHROME_FRAME); | 360 installer_state->FindProduct(BrowserDistribution::CHROME_FRAME); |
361 const ProductState* cf_state = | 361 const ProductState* cf_state = |
362 original_state.GetProductState(system_level, | 362 original_state.GetProductState(system_level, |
363 BrowserDistribution::CHROME_FRAME); | 363 BrowserDistribution::CHROME_FRAME); |
364 if (chrome != NULL) { | 364 if (chrome != NULL) { |
365 if (chrome_frame != NULL && | 365 if (chrome_frame != NULL && |
366 chrome_frame->HasOption(installer::kOptionReadyMode)) { | 366 chrome_frame->HasOption(installer::kOptionReadyMode)) { |
367 // We're being asked to install Chrome with Chrome Frame in ready-mode. | 367 // We're being asked to install Chrome with Chrome Frame in ready-mode. |
368 // This is an optimistic operation: if a SxS install of Chrome Frame | 368 // This is an optimistic operation: if a SxS install of Chrome Frame |
369 // is already present, don't touch it; if a multi-install of Chrome | 369 // is already present, don't touch it; if a multi-install of Chrome |
370 // Frame is present, preserve its settings (ready-mode, CEEE). | 370 // Frame is present, preserve its settings (ready-mode). |
371 if (cf_state != NULL) { | 371 if (cf_state != NULL) { |
372 installer_state->RemoveProduct(chrome_frame); | 372 installer_state->RemoveProduct(chrome_frame); |
373 chrome_frame = NULL; | 373 chrome_frame = NULL; |
374 if (cf_state->is_multi_install()) { | 374 if (cf_state->is_multi_install()) { |
375 chrome_frame = installer_state->AddProductFromState( | 375 chrome_frame = installer_state->AddProductFromState( |
376 BrowserDistribution::CHROME_FRAME, *cf_state); | 376 BrowserDistribution::CHROME_FRAME, *cf_state); |
377 VLOG(1) << "Upgrading existing multi-install Chrome Frame rather " | 377 VLOG(1) << "Upgrading existing multi-install Chrome Frame rather " |
378 "than installing in ready-mode."; | 378 "than installing in ready-mode."; |
379 } else { | 379 } else { |
380 VLOG(1) << "Skipping upgrade of single-install Chrome Frame rather " | 380 VLOG(1) << "Skipping upgrade of single-install Chrome Frame rather " |
(...skipping 959 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1340 if (!(installer_state.is_msi() && is_uninstall)) | 1340 if (!(installer_state.is_msi() && is_uninstall)) |
1341 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1341 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
1342 // to pass through, since this is only returned on uninstall which is | 1342 // to pass through, since this is only returned on uninstall which is |
1343 // never invoked directly by Google Update. | 1343 // never invoked directly by Google Update. |
1344 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1344 return_code = InstallUtil::GetInstallReturnCode(install_status); |
1345 | 1345 |
1346 VLOG(1) << "Installation complete, returning: " << return_code; | 1346 VLOG(1) << "Installation complete, returning: " << return_code; |
1347 | 1347 |
1348 return return_code; | 1348 return return_code; |
1349 } | 1349 } |
OLD | NEW |