| 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 true); | 472 true); |
| 473 install_list->AddSetRegValueWorkItem(reg_root, | 473 install_list->AddSetRegValueWorkItem(reg_root, |
| 474 uninstall_reg, | 474 uninstall_reg, |
| 475 KEY_WOW64_32KEY, | 475 KEY_WOW64_32KEY, |
| 476 L"InstallLocation", | 476 L"InstallLocation", |
| 477 install_path.value(), | 477 install_path.value(), |
| 478 true); | 478 true); |
| 479 | 479 |
| 480 BrowserDistribution* dist = product.distribution(); | 480 BrowserDistribution* dist = product.distribution(); |
| 481 base::string16 chrome_icon = ShellUtil::FormatIconLocation( | 481 base::string16 chrome_icon = ShellUtil::FormatIconLocation( |
| 482 install_path.Append(dist->GetIconFilename()), | 482 install_path.Append(dist->GetIconFilename()), dist->GetIconIndex()); |
| 483 dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME)); | |
| 484 install_list->AddSetRegValueWorkItem(reg_root, | 483 install_list->AddSetRegValueWorkItem(reg_root, |
| 485 uninstall_reg, | 484 uninstall_reg, |
| 486 KEY_WOW64_32KEY, | 485 KEY_WOW64_32KEY, |
| 487 L"DisplayIcon", | 486 L"DisplayIcon", |
| 488 chrome_icon, | 487 chrome_icon, |
| 489 true); | 488 true); |
| 490 install_list->AddSetRegValueWorkItem(reg_root, | 489 install_list->AddSetRegValueWorkItem(reg_root, |
| 491 uninstall_reg, | 490 uninstall_reg, |
| 492 KEY_WOW64_32KEY, | 491 KEY_WOW64_32KEY, |
| 493 L"NoModify", | 492 L"NoModify", |
| (...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 // Unconditionally remove the legacy Quick Enable command from the binaries. | 1353 // Unconditionally remove the legacy Quick Enable command from the binaries. |
| 1355 // Do this even if multi-install Chrome isn't installed to ensure that it is | 1354 // Do this even if multi-install Chrome isn't installed to ensure that it is |
| 1356 // not left behind in any case. | 1355 // not left behind in any case. |
| 1357 work_item_list->AddDeleteRegKeyWorkItem( | 1356 work_item_list->AddDeleteRegKeyWorkItem( |
| 1358 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) | 1357 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) |
| 1359 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + | 1358 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + |
| 1360 " command"); | 1359 " command"); |
| 1361 } | 1360 } |
| 1362 | 1361 |
| 1363 } // namespace installer | 1362 } // namespace installer |
| OLD | NEW |