summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/logging_installer.cc
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-23 18:53:52 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-23 18:53:52 +0000
commitd5937dff5bfa06d68262fc6d569cd5f5a6ac57c4 (patch)
tree1e5eb583fb086699df3db28c776b88f655625784 /chrome/installer/util/logging_installer.cc
parent3a29e2911047223baf873271abacf5ae34502fc6 (diff)
downloadchromium_src-d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4.zip
chromium_src-d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4.tar.gz
chromium_src-d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4.tar.bz2
Revert "installer: clean up to use FilePath instead of std::wstring."
This reverts commit 9da05365beb211e3879e6049547e5e92c4c0a5a2 (r32811). TBR=thiago.farina@gmail.com BUG=32811 Review URL: http://codereview.chromium.org/437011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/logging_installer.cc')
-rw-r--r--chrome/installer/util/logging_installer.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
index a7ac607..e03c25b 100644
--- a/chrome/installer/util/logging_installer.cc
+++ b/chrome/installer/util/logging_installer.cc
@@ -50,7 +50,8 @@ void EndInstallerLogging() {
}
std::wstring GetLogFilePath(const CommandLine& command_line) {
- if (command_line.HasSwitch(WideToASCII(installer_util::switches::kLogFile))) {
+ if (command_line.HasSwitch(
+ WideToASCII(installer_util::switches::kLogFile))) {
return command_line.GetSwitchValue(
WideToASCII(installer_util::switches::kLogFile));
}
@@ -63,9 +64,10 @@ std::wstring GetLogFilePath(const CommandLine& command_line) {
}
FilePath log_path;
+
if (PathService::Get(base::DIR_TEMP, &log_path)) {
log_path = log_path.Append(log_filename);
- return log_path.value();
+ return log_path.ToWStringHack();
} else {
return log_filename;
}