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

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

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 years, 5 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 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance, 1152 int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
1153 wchar_t* command_line, int show_command) { 1153 wchar_t* command_line, int show_command) {
1154 // The exit manager is in charge of calling the dtors of singletons. 1154 // The exit manager is in charge of calling the dtors of singletons.
1155 base::AtExitManager exit_manager; 1155 base::AtExitManager exit_manager;
1156 CommandLine::Init(0, NULL); 1156 CommandLine::Init(0, NULL);
1157 1157
1158 const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess(); 1158 const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
1159 installer::InitInstallerLogging(prefs); 1159 installer::InitInstallerLogging(prefs);
1160 1160
1161 const CommandLine& cmd_line = *CommandLine::ForCurrentProcess(); 1161 const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
1162 VLOG(1) << "Command Line: " << cmd_line.command_line_string(); 1162 VLOG(1) << "Command Line: " << cmd_line.GetCommandLineString();
1163 1163
1164 VLOG(1) << "multi install is " << prefs.is_multi_install(); 1164 VLOG(1) << "multi install is " << prefs.is_multi_install();
1165 bool system_install = false; 1165 bool system_install = false;
1166 prefs.GetBool(installer::master_preferences::kSystemLevel, &system_install); 1166 prefs.GetBool(installer::master_preferences::kSystemLevel, &system_install);
1167 VLOG(1) << "system install is " << system_install; 1167 VLOG(1) << "system install is " << system_install;
1168 1168
1169 google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad( 1169 google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad(
1170 InitializeCrashReporting(system_install)); 1170 InitializeCrashReporting(system_install));
1171 1171
1172 InstallationState original_state; 1172 InstallationState original_state;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 if (!(installer_state.is_msi() && is_uninstall)) 1300 if (!(installer_state.is_msi() && is_uninstall))
1301 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1301 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1302 // to pass through, since this is only returned on uninstall which is 1302 // to pass through, since this is only returned on uninstall which is
1303 // never invoked directly by Google Update. 1303 // never invoked directly by Google Update.
1304 return_code = InstallUtil::GetInstallReturnCode(install_status); 1304 return_code = InstallUtil::GetInstallReturnCode(install_status);
1305 1305
1306 VLOG(1) << "Installation complete, returning: " << return_code; 1306 VLOG(1) << "Installation complete, returning: " << return_code;
1307 1307
1308 return return_code; 1308 return return_code;
1309 } 1309 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/util/google_chrome_distribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698