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

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

Issue 1116263002: Revert of Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Created 5 years, 7 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "chrome/installer/util/delete_tree_work_item.h" 49 #include "chrome/installer/util/delete_tree_work_item.h"
50 #include "chrome/installer/util/google_update_constants.h" 50 #include "chrome/installer/util/google_update_constants.h"
51 #include "chrome/installer/util/google_update_settings.h" 51 #include "chrome/installer/util/google_update_settings.h"
52 #include "chrome/installer/util/google_update_util.h" 52 #include "chrome/installer/util/google_update_util.h"
53 #include "chrome/installer/util/helper.h" 53 #include "chrome/installer/util/helper.h"
54 #include "chrome/installer/util/html_dialog.h" 54 #include "chrome/installer/util/html_dialog.h"
55 #include "chrome/installer/util/install_util.h" 55 #include "chrome/installer/util/install_util.h"
56 #include "chrome/installer/util/installation_state.h" 56 #include "chrome/installer/util/installation_state.h"
57 #include "chrome/installer/util/installation_validator.h" 57 #include "chrome/installer/util/installation_validator.h"
58 #include "chrome/installer/util/installer_state.h" 58 #include "chrome/installer/util/installer_state.h"
59 #include "chrome/installer/util/installer_util_strings.h"
60 #include "chrome/installer/util/l10n_string_util.h" 59 #include "chrome/installer/util/l10n_string_util.h"
61 #include "chrome/installer/util/logging_installer.h" 60 #include "chrome/installer/util/logging_installer.h"
62 #include "chrome/installer/util/lzma_util.h" 61 #include "chrome/installer/util/lzma_util.h"
63 #include "chrome/installer/util/master_preferences.h" 62 #include "chrome/installer/util/master_preferences.h"
64 #include "chrome/installer/util/master_preferences_constants.h" 63 #include "chrome/installer/util/master_preferences_constants.h"
65 #include "chrome/installer/util/self_cleaning_temp_dir.h" 64 #include "chrome/installer/util/self_cleaning_temp_dir.h"
66 #include "chrome/installer/util/shell_util.h" 65 #include "chrome/installer/util/shell_util.h"
67 #include "chrome/installer/util/user_experiment.h" 66 #include "chrome/installer/util/user_experiment.h"
68 67
68 #include "installer_util_strings.h" // NOLINT
69
69 #if defined(GOOGLE_CHROME_BUILD) 70 #if defined(GOOGLE_CHROME_BUILD)
70 #include "chrome/installer/util/updating_app_registration_data.h" 71 #include "chrome/installer/util/updating_app_registration_data.h"
71 #endif 72 #endif
72 73
73 using installer::InstallerState; 74 using installer::InstallerState;
74 using installer::InstallationState; 75 using installer::InstallationState;
75 using installer::InstallationValidator; 76 using installer::InstallationValidator;
76 using installer::MasterPreferences; 77 using installer::MasterPreferences;
77 using installer::Product; 78 using installer::Product;
78 using installer::ProductState; 79 using installer::ProductState;
(...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after
1723 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1724 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1724 // to pass through, since this is only returned on uninstall which is 1725 // to pass through, since this is only returned on uninstall which is
1725 // never invoked directly by Google Update. 1726 // never invoked directly by Google Update.
1726 return_code = InstallUtil::GetInstallReturnCode(install_status); 1727 return_code = InstallUtil::GetInstallReturnCode(install_status);
1727 } 1728 }
1728 1729
1729 VLOG(1) << "Installation complete, returning: " << return_code; 1730 VLOG(1) << "Installation complete, returning: " << return_code;
1730 1731
1731 return return_code; 1732 return return_code;
1732 } 1733 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/app_launcher_installer.cc ('k') | chrome/installer/setup/setup_unittests.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698