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

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

Issue 2507293005: Force migrate all clients from multi-install back to single-install. (Closed)
Patch Set: gab comments Created 4 years 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
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 "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 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 bool system_install = false; 1698 bool system_install = false;
1699 prefs.GetBool(installer::master_preferences::kSystemLevel, &system_install); 1699 prefs.GetBool(installer::master_preferences::kSystemLevel, &system_install);
1700 VLOG(1) << "system install is " << system_install; 1700 VLOG(1) << "system install is " << system_install;
1701 1701
1702 InstallationState original_state; 1702 InstallationState original_state;
1703 original_state.Initialize(); 1703 original_state.Initialize();
1704 1704
1705 InstallerState installer_state; 1705 InstallerState installer_state;
1706 installer_state.Initialize(cmd_line, prefs, original_state); 1706 installer_state.Initialize(cmd_line, prefs, original_state);
1707 1707
1708 VLOG(1) << "is_migrating_to_single is "
1709 << installer_state.is_migrating_to_single();
1710
1708 persistent_histogram_storage.set_storage_dir( 1711 persistent_histogram_storage.set_storage_dir(
1709 installer::PersistentHistogramStorage::GetReportedStorageDir( 1712 installer::PersistentHistogramStorage::GetReportedStorageDir(
1710 installer_state.target_path())); 1713 installer_state.target_path()));
1711 1714
1712 installer::ConfigureCrashReporting(installer_state); 1715 installer::ConfigureCrashReporting(installer_state);
1713 installer::SetInitialCrashKeys(installer_state); 1716 installer::SetInitialCrashKeys(installer_state);
1714 installer::SetCrashKeysFromCommandLine(cmd_line); 1717 installer::SetCrashKeysFromCommandLine(cmd_line);
1715 1718
1716 // Make sure the process exits cleanly on unexpected errors. 1719 // Make sure the process exits cleanly on unexpected errors.
1717 base::EnableTerminationOnHeapCorruption(); 1720 base::EnableTerminationOnHeapCorruption();
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1849 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1847 // to pass through, since this is only returned on uninstall which is 1850 // to pass through, since this is only returned on uninstall which is
1848 // never invoked directly by Google Update. 1851 // never invoked directly by Google Update.
1849 return_code = InstallUtil::GetInstallReturnCode(install_status); 1852 return_code = InstallUtil::GetInstallReturnCode(install_status);
1850 } 1853 }
1851 1854
1852 VLOG(1) << "Installation complete, returning: " << return_code; 1855 VLOG(1) << "Installation complete, returning: " << return_code;
1853 1856
1854 return return_code; 1857 return return_code;
1855 } 1858 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/installer_state_unittest.cc ('k') | chrome/installer/util/master_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698