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

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

Issue 6588003: Add support for the quick-enable-cf command to the installer. This encompase... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 // Some command line options don't work with SxS install/uninstall 1076 // Some command line options don't work with SxS install/uninstall
1077 if (InstallUtil::IsChromeSxSProcess()) { 1077 if (InstallUtil::IsChromeSxSProcess()) {
1078 if (system_install || 1078 if (system_install ||
1079 prefs.is_multi_install() || 1079 prefs.is_multi_install() ||
1080 cmd_line.HasSwitch(installer::switches::kForceUninstall) || 1080 cmd_line.HasSwitch(installer::switches::kForceUninstall) ||
1081 cmd_line.HasSwitch(installer::switches::kMakeChromeDefault) || 1081 cmd_line.HasSwitch(installer::switches::kMakeChromeDefault) ||
1082 cmd_line.HasSwitch(installer::switches::kRegisterChromeBrowser) || 1082 cmd_line.HasSwitch(installer::switches::kRegisterChromeBrowser) ||
1083 cmd_line.HasSwitch( 1083 cmd_line.HasSwitch(
1084 installer::switches::kRemoveChromeRegistration) || 1084 installer::switches::kRemoveChromeRegistration) ||
1085 cmd_line.HasSwitch(installer::switches::kInactiveUserToast) || 1085 cmd_line.HasSwitch(installer::switches::kInactiveUserToast) ||
1086 cmd_line.HasSwitch(installer::switches::kSystemLevelToast)) { 1086 cmd_line.HasSwitch(installer::switches::kSystemLevelToast) ||
1087 cmd_line.HasSwitch(installer::switches::kChromeFrameQuickEnable)) {
1087 return installer::SXS_OPTION_NOT_SUPPORTED; 1088 return installer::SXS_OPTION_NOT_SUPPORTED;
1088 } 1089 }
1089 } 1090 }
1090 1091
1091 int exit_code = 0; 1092 int exit_code = 0;
1092 if (HandleNonInstallCmdLineOptions(original_state, cmd_line, &installer_state, 1093 if (HandleNonInstallCmdLineOptions(original_state, cmd_line, &installer_state,
1093 &exit_code)) 1094 &exit_code))
1094 return exit_code; 1095 return exit_code;
1095 1096
1096 if (system_install && !IsUserAnAdmin()) { 1097 if (system_install && !IsUserAnAdmin()) {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 if (!(installer_state.is_msi() && is_uninstall)) 1165 if (!(installer_state.is_msi() && is_uninstall))
1165 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1166 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1166 // to pass through, since this is only returned on uninstall which is 1167 // to pass through, since this is only returned on uninstall which is
1167 // never invoked directly by Google Update. 1168 // never invoked directly by Google Update.
1168 return_code = InstallUtil::GetInstallReturnCode(install_status); 1169 return_code = InstallUtil::GetInstallReturnCode(install_status);
1169 1170
1170 VLOG(1) << "Installation complete, returning: " << return_code; 1171 VLOG(1) << "Installation complete, returning: " << return_code;
1171 1172
1172 return return_code; 1173 return return_code;
1173 } 1174 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698