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

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

Issue 4989001: Attempt to reland http://codereview.chromium.org/4928002/... (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/master_preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/master_preferences.cc
===================================================================
--- chrome/installer/util/master_preferences.cc (revision 66087)
+++ chrome/installer/util/master_preferences.cc (working copy)
@@ -92,7 +92,7 @@
// distribution dictionary. Currently all switches added will be set to
// 'true'.
static const struct CmdLineSwitchToDistributionSwitch {
- const wchar_t* cmd_line_switch;
+ const char* cmd_line_switch;
const char* distribution_switch;
} translate_switches[] = {
{ installer_util::switches::kCeee,
@@ -136,7 +136,7 @@
// See if the log file path was specified on the command line.
std::wstring str_value(cmd_line.GetSwitchValueNative(
- WideToASCII(installer_util::switches::kLogFile)));
+ installer_util::switches::kLogFile));
if (!str_value.empty()) {
name.resize(arraysize(kDistroDict) - 1);
name.append(".").append(installer_util::master_preferences::kLogFile);
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/master_preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698