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

Unified Diff: chrome/installer/util/logging_installer.cc

Issue 270062: Use ASCII strings for switch names. (Closed)
Patch Set: victory Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.cc ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/logging_installer.cc
diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
index 25dceb2539e642138febaa12896983aeb6526f4f..02c0d9d0c67099b61dbc6daf224359bd27a6d67c 100644
--- a/chrome/installer/util/logging_installer.cc
+++ b/chrome/installer/util/logging_installer.cc
@@ -22,7 +22,8 @@ void InitInstallerLogging(const CommandLine& command_line) {
if (installer_logging_)
return;
- if (command_line.HasSwitch(installer_util::switches::kDisableLogging)) {
+ if (command_line.HasSwitch(
+ WideToASCII(installer_util::switches::kDisableLogging))) {
installer_logging_ = true;
return;
}
@@ -32,7 +33,8 @@ void InitInstallerLogging(const CommandLine& command_line) {
logging::LOCK_LOG_FILE,
logging::DELETE_OLD_LOG_FILE);
- if (command_line.HasSwitch(installer_util::switches::kVerboseLogging)) {
+ if (command_line.HasSwitch(
+ WideToASCII(installer_util::switches::kVerboseLogging))) {
logging::SetMinLogLevel(logging::LOG_INFO);
} else {
logging::SetMinLogLevel(logging::LOG_ERROR);
@@ -48,8 +50,10 @@ void EndInstallerLogging() {
}
std::wstring GetLogFilePath(const CommandLine& command_line) {
- if (command_line.HasSwitch(installer_util::switches::kLogFile)) {
- return command_line.GetSwitchValue(installer_util::switches::kLogFile);
+ if (command_line.HasSwitch(
+ WideToASCII(installer_util::switches::kLogFile))) {
+ return command_line.GetSwitchValue(
+ WideToASCII(installer_util::switches::kLogFile));
}
const std::wstring log_filename(L"chrome_installer.log");
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.cc ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698