| Index: chrome/installer/util/util_constants.cc
|
| diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
|
| index d7e7d3d506250882535b6774be8bb3c98834a045..d6b4efe8d926affe86fd9dcc17d925da037e327a 100644
|
| --- a/chrome/installer/util/util_constants.cc
|
| +++ b/chrome/installer/util/util_constants.cc
|
| @@ -48,10 +48,10 @@ const wchar_t kEnableLogging[] = L"enable-logging";
|
| const wchar_t kForceUninstall[] = L"force-uninstall";
|
|
|
| // Specify the file path of Chrome archive for install.
|
| -const wchar_t kInstallArchive[] = L"install-archive";
|
| +const char kInstallArchive[] = "install-archive";
|
|
|
| // Specify the file path of Chrome master preference file.
|
| -const wchar_t kInstallerData[] = L"installerdata";
|
| +const char kInstallerData[] = "installerdata";
|
|
|
| // If present, specify file path to write logging info.
|
| const wchar_t kLogFile[] = L"log-file";
|
| @@ -67,15 +67,15 @@ const wchar_t kMsi[] = L"msi";
|
|
|
| // Useful only when used with --update-setup-exe, otherwise ignored. It
|
| // specifies the full path where updated setup.exe will be stored.
|
| -const wchar_t kNewSetupExe[] = L"new-setup-exe";
|
| +const char kNewSetupExe[] = "new-setup-exe";
|
|
|
| // Register Chrome as a valid browser on the current sytem. This option
|
| // requires that setup.exe is running as admin. If this option is specified,
|
| // options kInstallArchive and kUninstall are ignored.
|
| -const wchar_t kRegisterChromeBrowser[] = L"register-chrome-browser";
|
| +const char kRegisterChromeBrowser[] = "register-chrome-browser";
|
|
|
| -const wchar_t kRegisterChromeBrowserSuffix[] =
|
| - L"register-chrome-browser-suffix";
|
| +const char kRegisterChromeBrowserSuffix[] =
|
| + "register-chrome-browser-suffix";
|
|
|
| // Renames chrome.exe to old_chrome.exe and renames new_chrome.exe to chrome.exe
|
| // to support in-use updates. Also deletes opv key.
|
| @@ -97,19 +97,19 @@ const wchar_t kUninstall[] = L"uninstall";
|
| // Also see --new-setup-exe. This command line option specifies a diff patch
|
| // that setup.exe will apply to itself and store the resulting binary in the
|
| // path given by --new-setup-exe.
|
| -const wchar_t kUpdateSetupExe[] = L"update-setup-exe";
|
| +const char kUpdateSetupExe[] = "update-setup-exe";
|
|
|
| // Enable verbose logging (info level).
|
| const wchar_t kVerboseLogging[] = L"verbose-logging";
|
|
|
| // Show the embedded EULA dialog.
|
| -const wchar_t kShowEula[] = L"show-eula";
|
| +const char kShowEula[] = "show-eula";
|
|
|
| // Use the alternate desktop shortcut name.
|
| const wchar_t kAltDesktopShortcut[] = L"alt-desktop-shortcut";
|
|
|
| // Perform the inactive user toast experiment.
|
| -const wchar_t kInactiveUserToast[] = L"inactive-user-toast";
|
| +const char kInactiveUserToast[] = "inactive-user-toast";
|
|
|
| // User toast experiment switch from system context to user context.
|
| const wchar_t kSystemLevelToast[] = L"system-level-toast";
|
|
|