Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 617 const Products& products = package.products(); | 617 const Products& products = package.products(); |
| 618 DCHECK(products.size()); | 618 DCHECK(products.size()); |
| 619 | 619 |
| 620 if (FindProduct(products, BrowserDistribution::CHROME_FRAME)) { | 620 if (FindProduct(products, BrowserDistribution::CHROME_FRAME)) { |
| 621 // Make sure that we don't end up deleting installed files on next reboot. | 621 // Make sure that we don't end up deleting installed files on next reboot. |
| 622 if (!RemoveFromMovesPendingReboot(package.path().value().c_str())) { | 622 if (!RemoveFromMovesPendingReboot(package.path().value().c_str())) { |
| 623 LOG(ERROR) << "Error accessing pending moves value."; | 623 LOG(ERROR) << "Error accessing pending moves value."; |
| 624 } | 624 } |
| 625 } | 625 } |
| 626 | 626 |
| 627 // TODO(tommi): See if we can't get rid of this parameter. | |
|
robertshield
2010/12/01 21:40:54
Gave up? :p
tommi (sloooow) - chröme
2010/12/01 22:07:15
yeah, well, this todo was added when I thought I c
| |
| 628 current_version->reset(package.GetCurrentVersion()); | 627 current_version->reset(package.GetCurrentVersion()); |
| 629 | 628 |
| 630 scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList()); | 629 scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList()); |
| 631 // A temp directory that work items need and the actual install directory. | 630 // A temp directory that work items need and the actual install directory. |
| 632 install_list->AddCreateDirWorkItem(temp_dir); | 631 install_list->AddCreateDirWorkItem(temp_dir); |
| 633 install_list->AddCreateDirWorkItem(package.path()); | 632 install_list->AddCreateDirWorkItem(package.path()); |
| 634 | 633 |
| 635 // Delete any new_chrome.exe if present (we will end up creating a new one | 634 // Delete any new_chrome.exe if present (we will end up creating a new one |
| 636 // if required) and then copy chrome.exe | 635 // if required) and then copy chrome.exe |
| 637 FilePath new_chrome_exe( | 636 FilePath new_chrome_exe( |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 843 if (!success && rollback_on_failure) { | 842 if (!success && rollback_on_failure) { |
| 844 work_item_list->Rollback(); | 843 work_item_list->Rollback(); |
| 845 } | 844 } |
| 846 } | 845 } |
| 847 | 846 |
| 848 return success; | 847 return success; |
| 849 } | 848 } |
| 850 | 849 |
| 851 } // namespace installer | 850 } // namespace installer |
| 852 | 851 |
| OLD | NEW |