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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 ++it) { | 237 ++it) { |
238 const Product& p = **it; | 238 const Product& p = **it; |
239 if (p.is_chrome()) { | 239 if (p.is_chrome()) { |
240 AddOsUpgradeWorkItems(installer_state, setup_path, new_version, p, | 240 AddOsUpgradeWorkItems(installer_state, setup_path, new_version, p, |
241 list); | 241 list); |
242 AddFirewallRulesWorkItems(installer_state, p.distribution(), | 242 AddFirewallRulesWorkItems(installer_state, p.distribution(), |
243 current_version == nullptr, list); | 243 current_version == nullptr, list); |
244 | 244 |
245 #if defined(GOOGLE_CHROME_BUILD) | 245 #if defined(GOOGLE_CHROME_BUILD) |
246 if (!InstallUtil::IsChromeSxSProcess()) { | 246 if (!InstallUtil::IsChromeSxSProcess()) { |
247 // Add items to set up the App Launcher's version key if Google Chrome | 247 // Remove the app launcher key as it has been deprecated. |
248 // is being installed or updated. | 248 RemoveAppLauncherVersionKey(installer_state.root_key()); |
249 AddAppLauncherVersionKeyWorkItems(installer_state.root_key(), | |
250 new_version, add_language_identifier, list); | |
251 } | 249 } |
252 #endif // GOOGLE_CHROME_BUILD | 250 #endif // GOOGLE_CHROME_BUILD |
253 InstallUtil::AddUpdateDowngradeVersionItem( | 251 InstallUtil::AddUpdateDowngradeVersionItem( |
254 installer_state.system_install(), current_version, new_version, | 252 installer_state.system_install(), current_version, new_version, |
255 p.distribution(), list); | 253 p.distribution(), list); |
256 } | 254 } |
257 if (p.is_chrome_binaries()) | 255 if (p.is_chrome_binaries()) |
258 AddQuickEnableChromeFrameWorkItems(installer_state, list); | 256 AddQuickEnableChromeFrameWorkItems(installer_state, list); |
259 } | 257 } |
260 } | 258 } |
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1361 // Unconditionally remove the legacy Quick Enable command from the binaries. | 1359 // Unconditionally remove the legacy Quick Enable command from the binaries. |
1362 // Do this even if multi-install Chrome isn't installed to ensure that it is | 1360 // Do this even if multi-install Chrome isn't installed to ensure that it is |
1363 // not left behind in any case. | 1361 // not left behind in any case. |
1364 work_item_list->AddDeleteRegKeyWorkItem( | 1362 work_item_list->AddDeleteRegKeyWorkItem( |
1365 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) | 1363 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) |
1366 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + | 1364 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + |
1367 " command"); | 1365 " command"); |
1368 } | 1366 } |
1369 | 1367 |
1370 } // namespace installer | 1368 } // namespace installer |
OLD | NEW |