| 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 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1332 // Initialize crash reporting for this process. This involves connecting to | 1332 // Initialize crash reporting for this process. This involves connecting to |
| 1333 // breakpad, etc. | 1333 // breakpad, etc. |
| 1334 google_breakpad::ExceptionHandler* InitializeCrashReporting( | 1334 google_breakpad::ExceptionHandler* InitializeCrashReporting( |
| 1335 bool system_install) { | 1335 bool system_install) { |
| 1336 // Only report crashes if the user allows it. | 1336 // Only report crashes if the user allows it. |
| 1337 if (!GoogleUpdateSettings::GetCollectStatsConsent()) | 1337 if (!GoogleUpdateSettings::GetCollectStatsConsent()) |
| 1338 return NULL; | 1338 return NULL; |
| 1339 | 1339 |
| 1340 // Get the alternate dump directory. We use the temp path. | 1340 // Get the alternate dump directory. We use the temp path. |
| 1341 base::FilePath temp_directory; | 1341 base::FilePath temp_directory; |
| 1342 if (!file_util::GetTempDir(&temp_directory) || temp_directory.empty()) | 1342 if (!base::GetTempDir(&temp_directory) || temp_directory.empty()) |
| 1343 return NULL; | 1343 return NULL; |
| 1344 | 1344 |
| 1345 wchar_t exe_path[MAX_PATH * 2] = {0}; | 1345 wchar_t exe_path[MAX_PATH * 2] = {0}; |
| 1346 GetModuleFileName(NULL, exe_path, arraysize(exe_path)); | 1346 GetModuleFileName(NULL, exe_path, arraysize(exe_path)); |
| 1347 | 1347 |
| 1348 // Build the pipe name. It can be either: | 1348 // Build the pipe name. It can be either: |
| 1349 // System-wide install: "NamedPipe\GoogleCrashServices\S-1-5-18" | 1349 // System-wide install: "NamedPipe\GoogleCrashServices\S-1-5-18" |
| 1350 // Per-user install: "NamedPipe\GoogleCrashServices\<user SID>" | 1350 // Per-user install: "NamedPipe\GoogleCrashServices\<user SID>" |
| 1351 string16 user_sid = kSystemPrincipalSid; | 1351 string16 user_sid = kSystemPrincipalSid; |
| 1352 | 1352 |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1859 // Call the newly updated setup.exe with kUncompressedArchive and | 1859 // Call the newly updated setup.exe with kUncompressedArchive and |
| 1860 // kMigrateChromeFrame to perform the migration. | 1860 // kMigrateChromeFrame to perform the migration. |
| 1861 LaunchChromeFrameMigrationProcess(*chrome_frame_state, cmd_line, | 1861 LaunchChromeFrameMigrationProcess(*chrome_frame_state, cmd_line, |
| 1862 installer_directory, system_install); | 1862 installer_directory, system_install); |
| 1863 } | 1863 } |
| 1864 | 1864 |
| 1865 VLOG(1) << "Installation complete, returning: " << return_code; | 1865 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1866 | 1866 |
| 1867 return return_code; | 1867 return return_code; |
| 1868 } | 1868 } |
| OLD | NEW |