| 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 // This file contains the definitions of the installer functions that build | 5 // This file contains the definitions of the installer functions that build |
| 6 // the WorkItemList used to install the application. | 6 // the WorkItemList used to install the application. |
| 7 | 7 |
| 8 #include "chrome/installer/setup/install_worker.h" | 8 #include "chrome/installer/setup/install_worker.h" |
| 9 | 9 |
| 10 #include <oaidl.h> | 10 #include <oaidl.h> |
| (...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 929 DCHECK(installer_state.is_multi_install()); | 929 DCHECK(installer_state.is_multi_install()); |
| 930 const bool system_install = installer_state.system_install(); | 930 const bool system_install = installer_state.system_install(); |
| 931 if (!original_state.GetProductState(system_install, | 931 if (!original_state.GetProductState(system_install, |
| 932 BrowserDistribution::CHROME_BINARIES)) { | 932 BrowserDistribution::CHROME_BINARIES)) { |
| 933 const HKEY root_key = installer_state.root_key(); | 933 const HKEY root_key = installer_state.root_key(); |
| 934 base::string16 multi_key( | 934 base::string16 multi_key( |
| 935 installer_state.multi_package_binaries_distribution()->GetStateKey()); | 935 installer_state.multi_package_binaries_distribution()->GetStateKey()); |
| 936 | 936 |
| 937 // Copy the value from the product with the greatest value. | 937 // Copy the value from the product with the greatest value. |
| 938 bool have_eula_accepted = false; | 938 bool have_eula_accepted = false; |
| 939 BrowserDistribution::Type product_type; | 939 BrowserDistribution::Type product_type = BrowserDistribution::NUM_TYPES; |
| 940 DWORD eula_accepted; | 940 DWORD eula_accepted = 0; |
| 941 const Products& products = installer_state.products(); | 941 const Products& products = installer_state.products(); |
| 942 for (Products::const_iterator it = products.begin(); it < products.end(); | 942 for (Products::const_iterator it = products.begin(); it < products.end(); |
| 943 ++it) { | 943 ++it) { |
| 944 const Product& product = **it; | 944 const Product& product = **it; |
| 945 if (product.is_chrome_binaries()) | 945 if (product.is_chrome_binaries()) |
| 946 continue; | 946 continue; |
| 947 DWORD dword_value = 0; | 947 DWORD dword_value = 0; |
| 948 BrowserDistribution::Type this_type = product.distribution()->GetType(); | 948 BrowserDistribution::Type this_type = product.distribution()->GetType(); |
| 949 const ProductState* product_state = | 949 const ProductState* product_state = |
| 950 original_state.GetNonVersionedProductState( | 950 original_state.GetNonVersionedProductState( |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1653 // Unconditionally remove the legacy Quick Enable command from the binaries. | 1653 // Unconditionally remove the legacy Quick Enable command from the binaries. |
| 1654 // Do this even if multi-install Chrome isn't installed to ensure that it is | 1654 // Do this even if multi-install Chrome isn't installed to ensure that it is |
| 1655 // not left behind in any case. | 1655 // not left behind in any case. |
| 1656 work_item_list->AddDeleteRegKeyWorkItem( | 1656 work_item_list->AddDeleteRegKeyWorkItem( |
| 1657 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) | 1657 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) |
| 1658 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + | 1658 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + |
| 1659 " command"); | 1659 " command"); |
| 1660 } | 1660 } |
| 1661 | 1661 |
| 1662 } // namespace installer | 1662 } // namespace installer |
| OLD | NEW |