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

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

Issue 11412015: Copy setup when quick-enabling app host to user-level from system-level. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Comments / move helpers to anonymous namespace. Created 8 years, 1 month 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
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 "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 1024
1025 for (Products::const_iterator it = products.begin(); 1025 for (Products::const_iterator it = products.begin();
1026 install_status != installer::UNINSTALL_CANCELLED && it < products.end(); 1026 install_status != installer::UNINSTALL_CANCELLED && it < products.end();
1027 ++it) { 1027 ++it) {
1028 prod_status = UninstallProduct(original_state, installer_state, 1028 prod_status = UninstallProduct(original_state, installer_state,
1029 cmd_line, remove_all, force, **it); 1029 cmd_line, remove_all, force, **it);
1030 if (prod_status != installer::UNINSTALL_SUCCESSFUL) 1030 if (prod_status != installer::UNINSTALL_SUCCESSFUL)
1031 install_status = prod_status; 1031 install_status = prod_status;
1032 } 1032 }
1033 1033
1034 install_status = installer::CleanUpInstallationDirectoryAfterUninstall(
1035 original_state, installer_state, cmd_line, install_status);
1036
1034 // Tell Google Update that an uninstall has taken place. 1037 // Tell Google Update that an uninstall has taken place.
1035 // Ignore the return value: success or failure of Google Update 1038 // Ignore the return value: success or failure of Google Update
1036 // has no bearing on the success or failure of Chrome's uninstallation. 1039 // has no bearing on the success or failure of Chrome's uninstallation.
1037 google_update::UninstallGoogleUpdate(installer_state.system_install()); 1040 google_update::UninstallGoogleUpdate(installer_state.system_install());
1038 1041
1039 return install_status; 1042 return install_status;
1040 } 1043 }
1041 1044
1042 installer::InstallStatus ShowEULADialog(const string16& inner_frame) { 1045 installer::InstallStatus ShowEULADialog(const string16& inner_frame) {
1043 VLOG(1) << "About to show EULA"; 1046 VLOG(1) << "About to show EULA";
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 if (!(installer_state.is_msi() && is_uninstall)) 1641 if (!(installer_state.is_msi() && is_uninstall))
1639 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1642 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1640 // to pass through, since this is only returned on uninstall which is 1643 // to pass through, since this is only returned on uninstall which is
1641 // never invoked directly by Google Update. 1644 // never invoked directly by Google Update.
1642 return_code = InstallUtil::GetInstallReturnCode(install_status); 1645 return_code = InstallUtil::GetInstallReturnCode(install_status);
1643 1646
1644 VLOG(1) << "Installation complete, returning: " << return_code; 1647 VLOG(1) << "Installation complete, returning: " << return_code;
1645 1648
1646 return return_code; 1649 return return_code;
1647 } 1650 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698