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

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

Issue 1405633002: Cleanup chrome/version.h handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Building Chrome is hard Created 5 years, 1 month 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
« no previous file with comments | « chrome/installer/setup/BUILD.gn ('k') | chrome/test/chromedriver/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 22 matching lines...) Expand all
33 #include "base/win/registry.h" 33 #include "base/win/registry.h"
34 #include "base/win/scoped_com_initializer.h" 34 #include "base/win/scoped_com_initializer.h"
35 #include "base/win/scoped_comptr.h" 35 #include "base/win/scoped_comptr.h"
36 #include "base/win/scoped_handle.h" 36 #include "base/win/scoped_handle.h"
37 #include "base/win/win_util.h" 37 #include "base/win/win_util.h"
38 #include "base/win/windows_version.h" 38 #include "base/win/windows_version.h"
39 #include "breakpad/src/client/windows/handler/exception_handler.h" 39 #include "breakpad/src/client/windows/handler/exception_handler.h"
40 #include "chrome/common/chrome_constants.h" 40 #include "chrome/common/chrome_constants.h"
41 #include "chrome/common/chrome_paths.h" 41 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/chrome_switches.h" 42 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/chrome_version.h"
43 #include "chrome/installer/setup/archive_patch_helper.h" 44 #include "chrome/installer/setup/archive_patch_helper.h"
44 #include "chrome/installer/setup/install.h" 45 #include "chrome/installer/setup/install.h"
45 #include "chrome/installer/setup/install_worker.h" 46 #include "chrome/installer/setup/install_worker.h"
46 #include "chrome/installer/setup/setup_constants.h" 47 #include "chrome/installer/setup/setup_constants.h"
47 #include "chrome/installer/setup/setup_util.h" 48 #include "chrome/installer/setup/setup_util.h"
48 #include "chrome/installer/setup/uninstall.h" 49 #include "chrome/installer/setup/uninstall.h"
49 #include "chrome/installer/util/browser_distribution.h" 50 #include "chrome/installer/util/browser_distribution.h"
50 #include "chrome/installer/util/channel_info.h" 51 #include "chrome/installer/util/channel_info.h"
51 #include "chrome/installer/util/delete_after_reboot_helper.h" 52 #include "chrome/installer/util/delete_after_reboot_helper.h"
52 #include "chrome/installer/util/delete_tree_work_item.h" 53 #include "chrome/installer/util/delete_tree_work_item.h"
53 #include "chrome/installer/util/google_update_constants.h" 54 #include "chrome/installer/util/google_update_constants.h"
54 #include "chrome/installer/util/google_update_settings.h" 55 #include "chrome/installer/util/google_update_settings.h"
55 #include "chrome/installer/util/google_update_util.h" 56 #include "chrome/installer/util/google_update_util.h"
56 #include "chrome/installer/util/helper.h" 57 #include "chrome/installer/util/helper.h"
57 #include "chrome/installer/util/html_dialog.h" 58 #include "chrome/installer/util/html_dialog.h"
58 #include "chrome/installer/util/install_util.h" 59 #include "chrome/installer/util/install_util.h"
59 #include "chrome/installer/util/installation_state.h" 60 #include "chrome/installer/util/installation_state.h"
60 #include "chrome/installer/util/installation_validator.h" 61 #include "chrome/installer/util/installation_validator.h"
61 #include "chrome/installer/util/installer_state.h" 62 #include "chrome/installer/util/installer_state.h"
62 #include "chrome/installer/util/installer_util_strings.h" 63 #include "chrome/installer/util/installer_util_strings.h"
63 #include "chrome/installer/util/l10n_string_util.h" 64 #include "chrome/installer/util/l10n_string_util.h"
64 #include "chrome/installer/util/logging_installer.h" 65 #include "chrome/installer/util/logging_installer.h"
65 #include "chrome/installer/util/lzma_util.h" 66 #include "chrome/installer/util/lzma_util.h"
66 #include "chrome/installer/util/master_preferences.h" 67 #include "chrome/installer/util/master_preferences.h"
67 #include "chrome/installer/util/master_preferences_constants.h" 68 #include "chrome/installer/util/master_preferences_constants.h"
68 #include "chrome/installer/util/self_cleaning_temp_dir.h" 69 #include "chrome/installer/util/self_cleaning_temp_dir.h"
69 #include "chrome/installer/util/shell_util.h" 70 #include "chrome/installer/util/shell_util.h"
70 #include "chrome/installer/util/user_experiment.h" 71 #include "chrome/installer/util/user_experiment.h"
71 #include "version.h" // NOLINT
72 72
73 #if defined(GOOGLE_CHROME_BUILD) 73 #if defined(GOOGLE_CHROME_BUILD)
74 #include "chrome/installer/util/updating_app_registration_data.h" 74 #include "chrome/installer/util/updating_app_registration_data.h"
75 #endif 75 #endif
76 76
77 using installer::InstallerState; 77 using installer::InstallerState;
78 using installer::InstallationState; 78 using installer::InstallationState;
79 using installer::InstallationValidator; 79 using installer::InstallationValidator;
80 using installer::MasterPreferences; 80 using installer::MasterPreferences;
81 using installer::Product; 81 using installer::Product;
(...skipping 1799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1881 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1882 // to pass through, since this is only returned on uninstall which is 1882 // to pass through, since this is only returned on uninstall which is
1883 // never invoked directly by Google Update. 1883 // never invoked directly by Google Update.
1884 return_code = InstallUtil::GetInstallReturnCode(install_status); 1884 return_code = InstallUtil::GetInstallReturnCode(install_status);
1885 } 1885 }
1886 1886
1887 VLOG(1) << "Installation complete, returning: " << return_code; 1887 VLOG(1) << "Installation complete, returning: " << return_code;
1888 1888
1889 return return_code; 1889 return return_code;
1890 } 1890 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/BUILD.gn ('k') | chrome/test/chromedriver/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698