Chromium Code Reviews| 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 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1216 AddVersionKeyWorkItems(root, product.distribution(), new_version, | 1216 AddVersionKeyWorkItems(root, product.distribution(), new_version, |
| 1217 add_language_identifier, install_list); | 1217 add_language_identifier, install_list); |
| 1218 | 1218 |
| 1219 AddDelegateExecuteWorkItems(installer_state, target_path, new_version, | 1219 AddDelegateExecuteWorkItems(installer_state, target_path, new_version, |
| 1220 product, install_list); | 1220 product, install_list); |
| 1221 | 1221 |
| 1222 AddActiveSetupWorkItems(installer_state, setup_path, new_version, product, | 1222 AddActiveSetupWorkItems(installer_state, setup_path, new_version, product, |
| 1223 install_list); | 1223 install_list); |
| 1224 } | 1224 } |
| 1225 | 1225 |
| 1226 // TODO(huangs): Implement actual migration code and remove the hack below. | |
| 1227 // If installing Chrome without the deprecated stand-alone App Launcher, | |
| 1228 // add "shadow" App Launcher registry keys so Google Update would recognize | |
| 1229 // the "dr" value in the App Launcher ClientState key. | |
| 1230 if (installer_state.is_multi_install() && | |
|
grt (UTC plus 2)
2013/05/07 20:52:02
Please add to the comment that this magically omit
huangs
2013/05/08 01:22:02
Done. I assume that Chrome Canary does not have 7
| |
| 1231 installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) && | |
| 1232 !installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST)) { | |
| 1233 BrowserDistribution* shadow_app_launcher_dist = | |
| 1234 BrowserDistribution::GetSpecificDistribution( | |
| 1235 BrowserDistribution::CHROME_APP_HOST); | |
| 1236 AddVersionKeyWorkItems(root, shadow_app_launcher_dist, new_version, | |
| 1237 add_language_identifier, install_list); | |
| 1238 } | |
| 1239 | |
| 1226 // Add any remaining work items that involve special settings for | 1240 // Add any remaining work items that involve special settings for |
| 1227 // each product. | 1241 // each product. |
| 1228 AddProductSpecificWorkItems(original_state, installer_state, setup_path, | 1242 AddProductSpecificWorkItems(original_state, installer_state, setup_path, |
| 1229 new_version, install_list); | 1243 new_version, install_list); |
| 1230 | 1244 |
| 1231 // Copy over brand, usagestats, and other values. | 1245 // Copy over brand, usagestats, and other values. |
| 1232 AddGoogleUpdateWorkItems(original_state, installer_state, install_list); | 1246 AddGoogleUpdateWorkItems(original_state, installer_state, install_list); |
| 1233 | 1247 |
| 1234 // Append the tasks that run after the installation. | 1248 // Append the tasks that run after the installation. |
| 1235 AppendPostInstallTasks(installer_state, | 1249 AppendPostInstallTasks(installer_state, |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1697 if (installer_state.system_install()) | 1711 if (installer_state.system_install()) |
| 1698 cmd_line.AppendSwitch(switches::kSystemLevel); | 1712 cmd_line.AppendSwitch(switches::kSystemLevel); |
| 1699 AppCommand cmd(cmd_line.GetCommandLineString()); | 1713 AppCommand cmd(cmd_line.GetCommandLineString()); |
| 1700 cmd.set_sends_pings(true); | 1714 cmd.set_sends_pings(true); |
| 1701 cmd.set_is_web_accessible(true); | 1715 cmd.set_is_web_accessible(true); |
| 1702 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list); | 1716 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list); |
| 1703 } | 1717 } |
| 1704 } | 1718 } |
| 1705 | 1719 |
| 1706 } // namespace installer | 1720 } // namespace installer |
| OLD | NEW |