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

Side by Side Diff: chrome/installer/util/util_constants.cc

Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove query-eula-acceptance; changing ChannelInfo cleanup approach. Created 5 years, 11 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/util/util_constants.h" 5 #include "chrome/installer/util/util_constants.h"
6 6
7 namespace installer { 7 namespace installer {
8 8
9 namespace switches { 9 namespace switches {
10 10
11 // Whether to set Chrome to launch at computer startup. 11 // Whether to set Chrome to launch at computer startup.
12 const char kAutoLaunchChrome[] = "auto-launch-chrome"; 12 const char kAutoLaunchChrome[] = "auto-launch-chrome";
13 13
14 // Install Chrome. 14 // Install Chrome.
15 // Currently this is only required when used in combination with kMultiInstall. 15 // Currently this is only required when used in combination with kMultiInstall.
16 const char kChrome[] = "chrome"; 16 const char kChrome[] = "chrome";
17 17
18 // Install Chrome App Host. This is now interpreted as kChromeAppLauncher.
19 // TODO(huangs): Remove by M27.
20 const char kChromeAppHostDeprecated[] = "app-host";
21
22 // Install Chrome App Launcher, which subsumes Chrome App Host, i.e.,
23 // App Launcher install converts App Host to App Launcher, and all subsequent
24 // App Host updates/uninstalls become App Launcher updates/uninstalls.
25 const char kChromeAppLauncher[] = "app-launcher";
grt (UTC plus 2) 2015/01/20 21:30:23 I think this (and probably app-host) should be add
huangs 2015/01/20 23:26:00 Perhaps to uninstall? But there are very few peop
grt (UTC plus 2) 2015/01/21 02:18:12 If I'm not mistaken, uninstall isn't a concern sin
huangs 2015/01/21 20:33:52 I think all is good, but since you asked I should
26
27 // Install Chrome Frame. 18 // Install Chrome Frame.
28 const char kChromeFrame[] = "chrome-frame"; 19 const char kChromeFrame[] = "chrome-frame";
29 20
30 // Run the installer for Chrome SxS. 21 // Run the installer for Chrome SxS.
31 const char kChromeSxS[] = "chrome-sxs"; 22 const char kChromeSxS[] = "chrome-sxs";
32 23
33 // Create shortcuts for this user to point to a system-level install (which 24 // Create shortcuts for this user to point to a system-level install (which
34 // must already be installed on the machine). The shortcuts created will 25 // must already be installed on the machine). The shortcuts created will
35 // match the preferences of the already present system-level install as such 26 // match the preferences of the already present system-level install as such
36 // this option is not compatible with any other installer options. 27 // this option is not compatible with any other installer options.
(...skipping 19 matching lines...) Expand all
56 "do-not-register-for-update-launch"; 47 "do-not-register-for-update-launch";
57 48
58 // By default we remove all shared (between users) files, registry entries etc 49 // By default we remove all shared (between users) files, registry entries etc
59 // during uninstall. If this option is specified together with kUninstall option 50 // during uninstall. If this option is specified together with kUninstall option
60 // we do not clean up shared entries otherwise this option is ignored. 51 // we do not clean up shared entries otherwise this option is ignored.
61 const char kDoNotRemoveSharedItems[] = "do-not-remove-shared-items"; 52 const char kDoNotRemoveSharedItems[] = "do-not-remove-shared-items";
62 53
63 // Enable logging at the error level. This is the default behavior. 54 // Enable logging at the error level. This is the default behavior.
64 const char kEnableLogging[] = "enable-logging"; 55 const char kEnableLogging[] = "enable-logging";
65 56
66 // Ensures that Google Update is present at the current level of installation.
67 const char kEnsureGoogleUpdatePresent[] = "ensure-google-update-present";
68
69 // Same as kConfigureUserSettings above; except the checks to know whether 57 // Same as kConfigureUserSettings above; except the checks to know whether
70 // first run already occured are bypassed and shortcuts are created either way 58 // first run already occured are bypassed and shortcuts are created either way
71 // (kConfigureUserSettings also needs to be on the command-line for this to have 59 // (kConfigureUserSettings also needs to be on the command-line for this to have
72 // any effect). 60 // any effect).
73 const char kForceConfigureUserSettings[] = "force-configure-user-settings"; 61 const char kForceConfigureUserSettings[] = "force-configure-user-settings";
74 62
75 // If present, setup will uninstall chrome without asking for any 63 // If present, setup will uninstall chrome without asking for any
76 // confirmation from user. 64 // confirmation from user.
77 const char kForceUninstall[] = "force-uninstall"; 65 const char kForceUninstall[] = "force-uninstall";
78 66
(...skipping 22 matching lines...) Expand all
101 // (e.g. Chrome Frame, Chrome) 89 // (e.g. Chrome Frame, Chrome)
102 const char kMultiInstall[] = "multi-install"; 90 const char kMultiInstall[] = "multi-install";
103 91
104 // Useful only when used with --update-setup-exe, otherwise ignored. It 92 // Useful only when used with --update-setup-exe, otherwise ignored. It
105 // specifies the full path where updated setup.exe will be stored. 93 // specifies the full path where updated setup.exe will be stored.
106 const char kNewSetupExe[] = "new-setup-exe"; 94 const char kNewSetupExe[] = "new-setup-exe";
107 95
108 // Notify the installer that the OS has been upgraded. 96 // Notify the installer that the OS has been upgraded.
109 const char kOnOsUpgrade[] = "on-os-upgrade"; 97 const char kOnOsUpgrade[] = "on-os-upgrade";
110 98
111 // Determines whether or not EULA has been accepted at some point. Returns via
112 // exit code: 0 if EULA not accepted, 1 if EULA accepted, and E_FAIL on error.
113 const char kQueryEULAAcceptance[] = "query-eula-acceptance";
114
115 // Requests that setup attempt to reenable autoupdates for Chrome. 99 // Requests that setup attempt to reenable autoupdates for Chrome.
116 const char kReenableAutoupdates[] = "reenable-autoupdates"; 100 const char kReenableAutoupdates[] = "reenable-autoupdates";
117 101
118 // Register Chrome as a valid browser on the current system. This option 102 // Register Chrome as a valid browser on the current system. This option
119 // requires that setup.exe is running as admin. If this option is specified, 103 // requires that setup.exe is running as admin. If this option is specified,
120 // options kInstallArchive and kUninstall are ignored. 104 // options kInstallArchive and kUninstall are ignored.
121 const char kRegisterChromeBrowser[] = "register-chrome-browser"; 105 const char kRegisterChromeBrowser[] = "register-chrome-browser";
122 106
123 // Used by the installer to forward the registration suffix of the 107 // Used by the installer to forward the registration suffix of the
124 // (un)installation in progress when launching an elevated setup.exe to finish 108 // (un)installation in progress when launching an elevated setup.exe to finish
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // necessary because Windows' installer detection heuristics (which include 190 // necessary because Windows' installer detection heuristics (which include
207 // things like process name being "setup.exe") will otherwise force elevation 191 // things like process name being "setup.exe") will otherwise force elevation
208 // for non-admin users when setup.exe is launched. This is mitigated by adding 192 // for non-admin users when setup.exe is launched. This is mitigated by adding
209 // requestedExecutionLevel="asInvoker" to setup.exe's manifest on Vista+, but 193 // requestedExecutionLevel="asInvoker" to setup.exe's manifest on Vista+, but
210 // there is no such manifest entry on Windows XP (which results in 194 // there is no such manifest entry on Windows XP (which results in
211 // crbug.com/166473). 195 // crbug.com/166473).
212 // TODO(gab): Rename setup.exe itself altogether and use the same binary for 196 // TODO(gab): Rename setup.exe itself altogether and use the same binary for
213 // Active Setup. 197 // Active Setup.
214 const wchar_t kActiveSetupExe[] = L"chrmstp.exe"; 198 const wchar_t kActiveSetupExe[] = L"chrmstp.exe";
215 const wchar_t kAppLauncherGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}"; 199 const wchar_t kAppLauncherGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";
216 const wchar_t kChromeAppHostExe[] = L"app_host.exe";
217 const wchar_t kChromeDll[] = L"chrome.dll"; 200 const wchar_t kChromeDll[] = L"chrome.dll";
218 const wchar_t kChromeChildDll[] = L"chrome_child.dll"; 201 const wchar_t kChromeChildDll[] = L"chrome_child.dll";
219 const wchar_t kChromeExe[] = L"chrome.exe"; 202 const wchar_t kChromeExe[] = L"chrome.exe";
220 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll"; 203 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll";
221 const wchar_t kChromeFrameHelperDll[] = L"chrome_frame_helper.dll"; 204 const wchar_t kChromeFrameHelperDll[] = L"chrome_frame_helper.dll";
222 const wchar_t kChromeFrameHelperExe[] = L"chrome_frame_helper.exe"; 205 const wchar_t kChromeFrameHelperExe[] = L"chrome_frame_helper.exe";
223 const wchar_t kChromeFrameHelperWndClass[] = L"ChromeFrameHelperWindowClass"; 206 const wchar_t kChromeFrameHelperWndClass[] = L"ChromeFrameHelperWindowClass";
224 const wchar_t kChromeLauncherExe[] = L"chrome_launcher.exe"; 207 const wchar_t kChromeLauncherExe[] = L"chrome_launcher.exe";
225 const wchar_t kChromeMetroDll[] = L"metro_driver.dll"; 208 const wchar_t kChromeMetroDll[] = L"metro_driver.dll";
226 const wchar_t kChromeNewExe[] = L"new_chrome.exe"; 209 const wchar_t kChromeNewExe[] = L"new_chrome.exe";
227 const wchar_t kChromeOldExe[] = L"old_chrome.exe"; 210 const wchar_t kChromeOldExe[] = L"old_chrome.exe";
228 const wchar_t kCmdOnOsUpgrade[] = L"on-os-upgrade"; 211 const wchar_t kCmdOnOsUpgrade[] = L"on-os-upgrade";
229 const wchar_t kCmdQueryEULAAcceptance[] = L"query-eula-acceptance";
230 const wchar_t kCmdQuickEnableApplicationHost[] =
231 L"quick-enable-application-host";
232 const wchar_t kCmdQuickEnableCf[] = L"quick-enable-cf"; 212 const wchar_t kCmdQuickEnableCf[] = L"quick-enable-cf";
233 const wchar_t kDelegateExecuteExe[] = L"delegate_execute.exe"; 213 const wchar_t kDelegateExecuteExe[] = L"delegate_execute.exe";
234 const wchar_t kEULASentinelFile[] = L"EULA Accepted"; 214 const wchar_t kEULASentinelFile[] = L"EULA Accepted";
235 const wchar_t kGoogleChromeInstallSubDir1[] = L"Google"; 215 const wchar_t kGoogleChromeInstallSubDir1[] = L"Google";
236 const wchar_t kGoogleChromeInstallSubDir2[] = L"Chrome"; 216 const wchar_t kGoogleChromeInstallSubDir2[] = L"Chrome";
237 const wchar_t kInstallBinaryDir[] = L"Application"; 217 const wchar_t kInstallBinaryDir[] = L"Application";
238 const wchar_t kInstallerDir[] = L"Installer"; 218 const wchar_t kInstallerDir[] = L"Installer";
239 const wchar_t kInstallTempDir[] = L"Temp"; 219 const wchar_t kInstallTempDir[] = L"Temp";
240 const wchar_t kLnkExt[] = L".lnk"; 220 const wchar_t kLnkExt[] = L".lnk";
241 const wchar_t kNaClExe[] = L"nacl64.exe"; 221 const wchar_t kNaClExe[] = L"nacl64.exe";
(...skipping 20 matching lines...) Expand all
262 const wchar_t kChromeChannelBeta[] = L"beta"; 242 const wchar_t kChromeChannelBeta[] = L"beta";
263 const wchar_t kChromeChannelStable[] = L""; 243 const wchar_t kChromeChannelStable[] = L"";
264 const wchar_t kChromeChannelStableExplicit[] = L"stable"; 244 const wchar_t kChromeChannelStableExplicit[] = L"stable";
265 245
266 const size_t kMaxAppModelIdLength = 64U; 246 const size_t kMaxAppModelIdLength = 64U;
267 247
268 const char kCourgette[] = "courgette"; 248 const char kCourgette[] = "courgette";
269 const char kBsdiff[] = "bsdiff"; 249 const char kBsdiff[] = "bsdiff";
270 250
271 } // namespace installer 251 } // namespace installer
OLDNEW
« chrome/installer/util/channel_info.h ('K') | « chrome/installer/util/util_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698