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

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

Issue 21150006: Introduce --cancel-first-run and reduce the strength of --no-first-run. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: --skip-first-run => --no-first-run Created 7 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/common/chrome_switches.cc ('k') | chrome/test/nacl/nacl_browsertest_util.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 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 system_level_cmd.SetProgram(system_exe_path); 1104 system_level_cmd.SetProgram(system_exe_path);
1105 1105
1106 base::FilePath first_run_sentinel; 1106 base::FilePath first_run_sentinel;
1107 InstallUtil::GetSentinelFilePath( 1107 InstallUtil::GetSentinelFilePath(
1108 chrome::kFirstRunSentinel, dist, &first_run_sentinel); 1108 chrome::kFirstRunSentinel, dist, &first_run_sentinel);
1109 if (base::PathExists(first_run_sentinel)) { 1109 if (base::PathExists(first_run_sentinel)) {
1110 // If the Chrome being self-destructed has already undergone First Run, 1110 // If the Chrome being self-destructed has already undergone First Run,
1111 // trigger Active Setup and make sure the system-level Chrome doesn't go 1111 // trigger Active Setup and make sure the system-level Chrome doesn't go
1112 // through first run. 1112 // through first run.
1113 trigger_active_setup = true; 1113 trigger_active_setup = true;
1114 system_level_cmd.AppendSwitch(::switches::kNoFirstRun); 1114 system_level_cmd.AppendSwitch(::switches::kCancelFirstRun);
1115 } 1115 }
1116 } 1116 }
1117 } 1117 }
1118 if (installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES)) { 1118 if (installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES)) {
1119 // Chrome Binaries should be last; if something else is cancelled, they 1119 // Chrome Binaries should be last; if something else is cancelled, they
1120 // should stay. 1120 // should stay.
1121 DCHECK(products[products.size() - 1]->is_chrome_binaries()); 1121 DCHECK(products[products.size() - 1]->is_chrome_binaries());
1122 } 1122 }
1123 1123
1124 installer::InstallStatus install_status = installer::UNINSTALL_SUCCESSFUL; 1124 installer::InstallStatus install_status = installer::UNINSTALL_SUCCESSFUL;
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1847 if (!(installer_state.is_msi() && is_uninstall)) 1847 if (!(installer_state.is_msi() && is_uninstall))
1848 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1848 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1849 // to pass through, since this is only returned on uninstall which is 1849 // to pass through, since this is only returned on uninstall which is
1850 // never invoked directly by Google Update. 1850 // never invoked directly by Google Update.
1851 return_code = InstallUtil::GetInstallReturnCode(install_status); 1851 return_code = InstallUtil::GetInstallReturnCode(install_status);
1852 1852
1853 VLOG(1) << "Installation complete, returning: " << return_code; 1853 VLOG(1) << "Installation complete, returning: " << return_code;
1854 1854
1855 return return_code; 1855 return return_code;
1856 } 1856 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/test/nacl/nacl_browsertest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698