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

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

Issue 10454067: Remove RemoveChromeLegacyRegistryKeys() -- an old Registry cleanup function from Sept. 2009 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | « no previous file | 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 <windows.h> 5 #include <windows.h>
6 #include <msi.h> 6 #include <msi.h>
7 #include <shellapi.h> 7 #include <shellapi.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 VLOG(1) << "First install successful."; 713 VLOG(1) << "First install successful.";
714 if (chrome_install) { 714 if (chrome_install) {
715 // We never want to launch Chrome in system level install mode. 715 // We never want to launch Chrome in system level install mode.
716 bool do_not_launch_chrome = false; 716 bool do_not_launch_chrome = false;
717 prefs.GetBool( 717 prefs.GetBool(
718 installer::master_preferences::kDoNotLaunchChrome, 718 installer::master_preferences::kDoNotLaunchChrome,
719 &do_not_launch_chrome); 719 &do_not_launch_chrome);
720 if (!system_install && !do_not_launch_chrome) 720 if (!system_install && !do_not_launch_chrome)
721 chrome_install->LaunchChrome(installer_state.target_path()); 721 chrome_install->LaunchChrome(installer_state.target_path());
722 } 722 }
723 } else if ((install_status == installer::NEW_VERSION_UPDATED) ||
724 (install_status == installer::IN_USE_UPDATED)) {
725 const Product* chrome = installer_state.FindProduct(
726 BrowserDistribution::CHROME_BROWSER);
727 if (chrome != NULL)
728 installer::RemoveChromeLegacyRegistryKeys(chrome->distribution());
729 } 723 }
730 } 724 }
731 } 725 }
732 726
733 // There might be an experiment (for upgrade usually) that needs to happen. 727 // There might be an experiment (for upgrade usually) that needs to happen.
734 // An experiment's outcome can include chrome's uninstallation. If that is 728 // An experiment's outcome can include chrome's uninstallation. If that is
735 // the case we would not do that directly at this point but in another 729 // the case we would not do that directly at this point but in another
736 // instance of setup.exe 730 // instance of setup.exe
737 // 731 //
738 // There is another way to reach this same function if this is a system 732 // There is another way to reach this same function if this is a system
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 if (!(installer_state.is_msi() && is_uninstall)) 1378 if (!(installer_state.is_msi() && is_uninstall))
1385 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1379 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1386 // to pass through, since this is only returned on uninstall which is 1380 // to pass through, since this is only returned on uninstall which is
1387 // never invoked directly by Google Update. 1381 // never invoked directly by Google Update.
1388 return_code = InstallUtil::GetInstallReturnCode(install_status); 1382 return_code = InstallUtil::GetInstallReturnCode(install_status);
1389 1383
1390 VLOG(1) << "Installation complete, returning: " << return_code; 1384 VLOG(1) << "Installation complete, returning: " << return_code;
1391 1385
1392 return return_code; 1386 return return_code;
1393 } 1387 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698