Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(975)

Side by Side Diff: chrome/installer/setup/setup_main.cc

Issue 422453004: Remove some dead app host code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more removals from sam Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/setup_constants.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "chrome/installer/setup/setup_main.h" 5 #include "chrome/installer/setup/setup_main.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <msi.h> 8 #include <msi.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 } 1632 }
1633 } else if ((install_status == NEW_VERSION_UPDATED) || 1633 } else if ((install_status == NEW_VERSION_UPDATED) ||
1634 (install_status == IN_USE_UPDATED)) { 1634 (install_status == IN_USE_UPDATED)) {
1635 const Product* chrome = installer_state.FindProduct( 1635 const Product* chrome = installer_state.FindProduct(
1636 BrowserDistribution::CHROME_BROWSER); 1636 BrowserDistribution::CHROME_BROWSER);
1637 if (chrome != NULL) { 1637 if (chrome != NULL) {
1638 DCHECK_NE(chrome_exe, base::string16()); 1638 DCHECK_NE(chrome_exe, base::string16());
1639 RemoveChromeLegacyRegistryKeys(chrome->distribution(), chrome_exe); 1639 RemoveChromeLegacyRegistryKeys(chrome->distribution(), chrome_exe);
1640 } 1640 }
1641 } 1641 }
1642
1643 if (prefs.install_chrome_app_launcher() &&
1644 InstallUtil::GetInstallReturnCode(install_status) == 0) {
1645 std::string webstore_item(google_update::GetUntrustedDataValue(
1646 kInstallFromWebstore));
1647 if (!webstore_item.empty()) {
1648 bool success = InstallFromWebstore(webstore_item);
1649 VLOG_IF(1, !success) << "Failed to launch app installation.";
1650 }
1651 }
1652 } 1642 }
1653 } 1643 }
1654 1644
1655 // There might be an experiment (for upgrade usually) that needs to happen. 1645 // There might be an experiment (for upgrade usually) that needs to happen.
1656 // An experiment's outcome can include chrome's uninstallation. If that is 1646 // An experiment's outcome can include chrome's uninstallation. If that is
1657 // the case we would not do that directly at this point but in another 1647 // the case we would not do that directly at this point but in another
1658 // instance of setup.exe 1648 // instance of setup.exe
1659 // 1649 //
1660 // There is another way to reach this same function if this is a system 1650 // There is another way to reach this same function if this is a system
1661 // level install. See HandleNonInstallCmdLineOptions(). 1651 // level install. See HandleNonInstallCmdLineOptions().
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1842 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1832 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1843 // to pass through, since this is only returned on uninstall which is 1833 // to pass through, since this is only returned on uninstall which is
1844 // never invoked directly by Google Update. 1834 // never invoked directly by Google Update.
1845 return_code = InstallUtil::GetInstallReturnCode(install_status); 1835 return_code = InstallUtil::GetInstallReturnCode(install_status);
1846 } 1836 }
1847 1837
1848 VLOG(1) << "Installation complete, returning: " << return_code; 1838 VLOG(1) << "Installation complete, returning: " << return_code;
1849 1839
1850 return return_code; 1840 return return_code;
1851 } 1841 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/setup_constants.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698