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

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

Issue 115993006: Revert of Remove installation of Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/installer_state_unittest.cc ('k') | chrome/installer/util/master_preferences.h » ('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 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
« no previous file with comments | « chrome/installer/util/installer_state_unittest.cc ('k') | chrome/installer/util/master_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698