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

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

Issue 10837128: Temporarily ifdef out Active Setup for M22 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/install_worker.cc ('k') | no next file » | 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 // This file defines the methods useful for uninstalling Chrome. 5 // This file defines the methods useful for uninstalling Chrome.
6 6
7 #include "chrome/installer/setup/uninstall.h" 7 #include "chrome/installer/setup/uninstall.h"
8 8
9 #include <windows.h> 9 #include <windows.h>
10 10
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 // !|remove_all| for now). 1021 // !|remove_all| for now).
1022 if (installer_state.system_install() || 1022 if (installer_state.system_install() ||
1023 (remove_all && 1023 (remove_all &&
1024 ShellUtil::QuickIsChromeRegisteredInHKLM( 1024 ShellUtil::QuickIsChromeRegisteredInHKLM(
1025 browser_dist, chrome_exe, suffix))) { 1025 browser_dist, chrome_exe, suffix))) {
1026 DeleteChromeRegistrationKeys(browser_dist, HKEY_LOCAL_MACHINE, suffix, 1026 DeleteChromeRegistrationKeys(browser_dist, HKEY_LOCAL_MACHINE, suffix,
1027 installer_state.target_path(), &ret); 1027 installer_state.target_path(), &ret);
1028 } 1028 }
1029 1029
1030 ProcessDelegateExecuteWorkItems(installer_state, product); 1030 ProcessDelegateExecuteWorkItems(installer_state, product);
1031
1032 // TODO(gab): This is only disabled for M22 as the shortcut CL using Active
1033 // Setup will not make it in M22.
1034 #if 0
1031 UninstallActiveSetupEntries(installer_state, product); 1035 UninstallActiveSetupEntries(installer_state, product);
1036 #endif
1032 } 1037 }
1033 1038
1034 if (product.is_chrome_frame()) { 1039 if (product.is_chrome_frame()) {
1035 ProcessChromeFrameWorkItems(original_state, installer_state, setup_path, 1040 ProcessChromeFrameWorkItems(original_state, installer_state, setup_path,
1036 product); 1041 product);
1037 } 1042 }
1038 1043
1039 if (installer_state.is_multi_install()) 1044 if (installer_state.is_multi_install())
1040 ProcessGoogleUpdateItems(original_state, installer_state, product); 1045 ProcessGoogleUpdateItems(original_state, installer_state, product);
1041 1046
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 1142
1138 // Try and delete the preserved local state once the post-install 1143 // Try and delete the preserved local state once the post-install
1139 // operations are complete. 1144 // operations are complete.
1140 if (!backup_state_file.empty()) 1145 if (!backup_state_file.empty())
1141 file_util::Delete(backup_state_file, false); 1146 file_util::Delete(backup_state_file, false);
1142 1147
1143 return ret; 1148 return ret;
1144 } 1149 }
1145 1150
1146 } // namespace installer 1151 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698