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

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

Issue 4988001: Revert 66088 - Changing the installer switches from wchar_t[] to char[].... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | chrome/installer/util/util_constants.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Defines all install related constants that need to be used by Chrome as 5 // Defines all install related constants that need to be used by Chrome as
6 // well as Chrome Installer. 6 // well as Chrome Installer.
7 7
8 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 8 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
9 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 9 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
10 #pragma once 10 #pragma once
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 INSTALL_DIR_IN_USE, // Installation directory is in use by another process 44 INSTALL_DIR_IN_USE, // Installation directory is in use by another process
45 UNINSTALL_REQUIRES_REBOOT, // Uninstallation required a reboot. 45 UNINSTALL_REQUIRES_REBOOT, // Uninstallation required a reboot.
46 IN_USE_UPDATED, // Chrome successfully updated but old version running 46 IN_USE_UPDATED, // Chrome successfully updated but old version running
47 SAME_VERSION_REPAIR_FAILED, // Chrome repair failed as Chrome was running 47 SAME_VERSION_REPAIR_FAILED, // Chrome repair failed as Chrome was running
48 REENTRY_SYS_UPDATE, // Setup has been re-launched as the interactive user 48 REENTRY_SYS_UPDATE, // Setup has been re-launched as the interactive user
49 SXS_OPTION_NOT_SUPPORTED // The chrome-sxs option provided does not work 49 SXS_OPTION_NOT_SUPPORTED // The chrome-sxs option provided does not work
50 // with other command line options. 50 // with other command line options.
51 }; 51 };
52 52
53 namespace switches { 53 namespace switches {
54 extern const char kCeee[]; 54 extern const wchar_t kCeee[];
55 extern const char kChrome[]; 55 extern const wchar_t kChrome[];
56 extern const char kChromeFrame[]; 56 extern const wchar_t kChromeFrame[];
57 extern const char kChromeSxS[]; 57 extern const wchar_t kChromeSxS[];
58 extern const char kCreateAllShortcuts[]; 58 extern const wchar_t kCreateAllShortcuts[];
59 extern const char kDeleteProfile[]; 59 extern const wchar_t kDeleteProfile[];
60 extern const char kDisableLogging[]; 60 extern const wchar_t kDisableLogging[];
61 extern const char kDoNotCreateShortcuts[]; 61 extern const wchar_t kDoNotCreateShortcuts[];
62 extern const char kDoNotLaunchChrome[]; 62 extern const wchar_t kDoNotLaunchChrome[];
63 extern const char kDoNotRegisterForUpdateLaunch[]; 63 extern const wchar_t kDoNotRegisterForUpdateLaunch[];
64 extern const char kDoNotRemoveSharedItems[]; 64 extern const wchar_t kDoNotRemoveSharedItems[];
65 extern const char kEnableLogging[]; 65 extern const wchar_t kEnableLogging[];
66 extern const char kForceUninstall[]; 66 extern const wchar_t kForceUninstall[];
67 extern const char kInstallArchive[]; 67 extern const char kInstallArchive[];
68 extern const char kInstallerData[]; 68 extern const char kInstallerData[];
69 extern const char kLogFile[]; 69 extern const wchar_t kLogFile[];
70 extern const char kMakeChromeDefault[]; 70 extern const wchar_t kMakeChromeDefault[];
71 extern const char kMsi[]; 71 extern const wchar_t kMsi[];
72 extern const char kMultiInstall[]; 72 extern const wchar_t kMultiInstall[];
73 extern const char kNewSetupExe[]; 73 extern const char kNewSetupExe[];
74 extern const char kRegisterChromeBrowser[]; 74 extern const char kRegisterChromeBrowser[];
75 extern const char kRegisterChromeBrowserSuffix[]; 75 extern const char kRegisterChromeBrowserSuffix[];
76 extern const char kRenameChromeExe[]; 76 extern const wchar_t kRenameChromeExe[];
77 extern const char kRemoveChromeRegistration[]; 77 extern const wchar_t kRemoveChromeRegistration[];
78 extern const char kRunAsAdmin[]; 78 extern const wchar_t kRunAsAdmin[];
79 extern const char kSystemLevel[]; 79 extern const wchar_t kSystemLevel[];
80 extern const char kUninstall[]; 80 extern const wchar_t kUninstall[];
81 extern const char kUpdateSetupExe[]; 81 extern const char kUpdateSetupExe[];
82 extern const char kVerboseLogging[]; 82 extern const wchar_t kVerboseLogging[];
83 extern const char kShowEula[]; 83 extern const char kShowEula[];
84 extern const char kAltDesktopShortcut[]; 84 extern const wchar_t kAltDesktopShortcut[];
85 extern const char kInactiveUserToast[]; 85 extern const char kInactiveUserToast[];
86 extern const char kSystemLevelToast[]; 86 extern const wchar_t kSystemLevelToast[];
87 extern const char kToastResultsKey[]; 87 extern const wchar_t kToastResultsKey[];
88 } // namespace switches 88 } // namespace switches
89 89
90 extern const wchar_t kChromeDll[]; 90 extern const wchar_t kChromeDll[];
91 extern const wchar_t kChromeExe[]; 91 extern const wchar_t kChromeExe[];
92 extern const wchar_t kChromeFrameDll[]; 92 extern const wchar_t kChromeFrameDll[];
93 extern const wchar_t kChromeFrameHelperExe[]; 93 extern const wchar_t kChromeFrameHelperExe[];
94 extern const wchar_t kChromeFrameHelperWndClass[]; 94 extern const wchar_t kChromeFrameHelperWndClass[];
95 extern const wchar_t kChromeNaCl64Dll[]; 95 extern const wchar_t kChromeNaCl64Dll[];
96 extern const wchar_t kChromeOldExe[]; 96 extern const wchar_t kChromeOldExe[];
97 extern const wchar_t kChromeNewExe[]; 97 extern const wchar_t kChromeNewExe[];
98 extern const wchar_t kGoogleChromeInstallSubDir1[]; 98 extern const wchar_t kGoogleChromeInstallSubDir1[];
99 extern const wchar_t kGoogleChromeInstallSubDir2[]; 99 extern const wchar_t kGoogleChromeInstallSubDir2[];
100 extern const wchar_t kInstallBinaryDir[]; 100 extern const wchar_t kInstallBinaryDir[];
101 extern const wchar_t kInstallerDir[]; 101 extern const wchar_t kInstallerDir[];
102 extern const wchar_t kInstallUserDataDir[]; 102 extern const wchar_t kInstallUserDataDir[];
103 extern const wchar_t kNaClExe[]; 103 extern const wchar_t kNaClExe[];
104 extern const wchar_t kSetupExe[]; 104 extern const wchar_t kSetupExe[];
105 extern const wchar_t kSxSSuffix[]; 105 extern const wchar_t kSxSSuffix[];
106 extern const wchar_t kUninstallArgumentsField[]; 106 extern const wchar_t kUninstallArgumentsField[];
107 extern const wchar_t kUninstallDisplayNameField[]; 107 extern const wchar_t kUninstallDisplayNameField[];
108 extern const wchar_t kUninstallInstallationDate[]; 108 extern const wchar_t kUninstallInstallationDate[];
109 extern const char kUninstallMetricsName[]; 109 extern const char kUninstallMetricsName[];
110 extern const wchar_t kUninstallStringField[]; 110 extern const wchar_t kUninstallStringField[];
111 111
112 } // namespace installer_util 112 } // namespace installer_util
113 113
114 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 114 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | chrome/installer/util/util_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698