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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/setup/setup_main.cc

Issue 660168: Disable registering, unregistering, and setting default browser... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 10 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/browser_init.cc ('K') | « chrome/browser/browser_init.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
===================================================================
--- chrome/installer/setup/setup_main.cc (revision 39907)
+++ chrome/installer/setup/setup_main.cc (working copy)
@@ -599,11 +599,6 @@
return installer_util::OS_ERROR;
}
- int exit_code = 0;
- if (HandleNonInstallCmdLineOptions(parsed_command_line, system_install,
- exit_code))
- return exit_code;
-
// Some command line options don't work with SxS install/uninstall
if (InstallUtil::IsChromeSxSProcess()) {
if (system_install ||
@@ -623,6 +618,11 @@
}
}
+ int exit_code = 0;
+ if (HandleNonInstallCmdLineOptions(parsed_command_line, system_install,
+ exit_code))
+ return exit_code;
+
if (system_install && !IsUserAnAdmin()) {
if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
!parsed_command_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
« chrome/browser/browser_init.cc ('K') | « chrome/browser/browser_init.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698