| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/installer/setup/install.h" | 5 #include "chrome/installer/setup/install.h" |
| 6 | 6 |
| 7 #include <shlobj.h> | 7 #include <shlobj.h> |
| 8 #include <time.h> | 8 #include <time.h> |
| 9 #include <winuser.h> | 9 #include <winuser.h> |
| 10 | 10 |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 const FilePath& archive_path, | 420 const FilePath& archive_path, |
| 421 const FilePath& install_temp_path, | 421 const FilePath& install_temp_path, |
| 422 const FilePath& prefs_path, | 422 const FilePath& prefs_path, |
| 423 const MasterPreferences& prefs, | 423 const MasterPreferences& prefs, |
| 424 const Version& new_version) { | 424 const Version& new_version) { |
| 425 FilePath src_path(install_temp_path); | 425 FilePath src_path(install_temp_path); |
| 426 src_path = src_path.Append(kInstallSourceDir).Append(kInstallSourceChromeDir); | 426 src_path = src_path.Append(kInstallSourceDir).Append(kInstallSourceChromeDir); |
| 427 | 427 |
| 428 // TODO(robertshield): Removing the pending on-reboot moves should be done | 428 // TODO(robertshield): Removing the pending on-reboot moves should be done |
| 429 // elsewhere. | 429 // elsewhere. |
| 430 // TODO(erikwright): Understand why this is Chrome Frame only and whether |
| 431 // it also applies to App Host. Shouldn't it apply to any multi-install too? |
| 430 const Products& products = installer_state.products(); | 432 const Products& products = installer_state.products(); |
| 431 DCHECK(products.size()); | 433 DCHECK(products.size()); |
| 432 if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) { | 434 if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) { |
| 433 // Make sure that we don't end up deleting installed files on next reboot. | 435 // Make sure that we don't end up deleting installed files on next reboot. |
| 434 if (!RemoveFromMovesPendingReboot( | 436 if (!RemoveFromMovesPendingReboot( |
| 435 installer_state.target_path().value().c_str())) { | 437 installer_state.target_path().value().c_str())) { |
| 436 LOG(ERROR) << "Error accessing pending moves value."; | 438 LOG(ERROR) << "Error accessing pending moves value."; |
| 437 } | 439 } |
| 438 } | 440 } |
| 439 | 441 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 installer_state.RemoveOldVersionDirectories( | 546 installer_state.RemoveOldVersionDirectories( |
| 545 new_version, | 547 new_version, |
| 546 existing_version.get(), | 548 existing_version.get(), |
| 547 install_temp_path); | 549 install_temp_path); |
| 548 } | 550 } |
| 549 | 551 |
| 550 return result; | 552 return result; |
| 551 } | 553 } |
| 552 | 554 |
| 553 } // namespace installer | 555 } // namespace installer |
| OLD | NEW |