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