| OLD | NEW |
| 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 "chrome/installer/setup/setup_main.h" | 5 #include "chrome/installer/setup/setup_main.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <msi.h> | 8 #include <msi.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #include <shlobj.h> | 10 #include <shlobj.h> |
| (...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1325 // The exit manager is in charge of calling the dtors of singletons. | 1325 // The exit manager is in charge of calling the dtors of singletons. |
| 1326 base::AtExitManager exit_manager; | 1326 base::AtExitManager exit_manager; |
| 1327 base::CommandLine::Init(0, NULL); | 1327 base::CommandLine::Init(0, NULL); |
| 1328 | 1328 |
| 1329 std::string process_type = | 1329 std::string process_type = |
| 1330 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 1330 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| 1331 switches::kProcessType); | 1331 switches::kProcessType); |
| 1332 | 1332 |
| 1333 if (process_type == crash_reporter::switches::kCrashpadHandler) { | 1333 if (process_type == crash_reporter::switches::kCrashpadHandler) { |
| 1334 return crash_reporter::RunAsCrashpadHandler( | 1334 return crash_reporter::RunAsCrashpadHandler( |
| 1335 *base::CommandLine::ForCurrentProcess(), switches::kProcessType); | 1335 *base::CommandLine::ForCurrentProcess(), base::FilePath(), |
| 1336 switches::kProcessType, switches::kUserDataDir); |
| 1336 } | 1337 } |
| 1337 | 1338 |
| 1338 // install_util uses chrome paths. | 1339 // install_util uses chrome paths. |
| 1339 chrome::RegisterPathProvider(); | 1340 chrome::RegisterPathProvider(); |
| 1340 | 1341 |
| 1341 const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess(); | 1342 const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess(); |
| 1342 installer::InitInstallerLogging(prefs); | 1343 installer::InitInstallerLogging(prefs); |
| 1343 | 1344 |
| 1344 const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess(); | 1345 const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess(); |
| 1345 VLOG(1) << "Command Line: " << cmd_line.GetCommandLineString(); | 1346 VLOG(1) << "Command Line: " << cmd_line.GetCommandLineString(); |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1503 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1504 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1504 // to pass through, since this is only returned on uninstall which is | 1505 // to pass through, since this is only returned on uninstall which is |
| 1505 // never invoked directly by Google Update. | 1506 // never invoked directly by Google Update. |
| 1506 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1507 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1507 } | 1508 } |
| 1508 | 1509 |
| 1509 VLOG(1) << "Installation complete, returning: " << return_code; | 1510 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1510 | 1511 |
| 1511 return return_code; | 1512 return return_code; |
| 1512 } | 1513 } |
| OLD | NEW |