| Index: chrome/installer/util/logging_installer.cc
|
| diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
|
| index 80442aaef78fb5a420a6ad0a9ce382c903ccfdd8..3ac60b365246e2af737583975e92a7e2eb5db1c3 100644
|
| --- a/chrome/installer/util/logging_installer.cc
|
| +++ b/chrome/installer/util/logging_installer.cc
|
| @@ -114,16 +114,20 @@
|
| base::FilePath GetLogFilePath(const installer::MasterPreferences& prefs) {
|
| std::string path;
|
| prefs.GetString(installer::master_preferences::kLogFile, &path);
|
| - if (!path.empty())
|
| + if (!path.empty()) {
|
| return base::FilePath(UTF8ToWide(path));
|
| + }
|
|
|
| - static const base::FilePath::CharType kLogFilename[] =
|
| - FILE_PATH_LITERAL("chrome_installer.log");
|
| + std::wstring log_filename = prefs.install_chrome_frame() ?
|
| + L"chrome_frame_installer.log" : L"chrome_installer.log";
|
|
|
| - // Fallback to current directory if getting the temp directory fails.
|
| - base::FilePath tmp_path;
|
| - ignore_result(PathService::Get(base::DIR_TEMP, &tmp_path));
|
| - return tmp_path.Append(kLogFilename);
|
| + base::FilePath log_path;
|
| + if (PathService::Get(base::DIR_TEMP, &log_path)) {
|
| + log_path = log_path.Append(log_filename);
|
| + return log_path;
|
| + } else {
|
| + return base::FilePath(log_filename);
|
| + }
|
| }
|
|
|
| } // namespace installer
|
|
|