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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 23588009: Parse /etc/lsb-release only once on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 7 years, 3 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
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 08b9e43d26909c4c90d033731b942780a88787b8..4da7b70a54a7c0d489ebd076b48d91a59939dda9 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -76,6 +76,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "base/i18n/time_formatting.h"
#include "base/sys_info.h"
#include "chrome/browser/chromeos/boot_times_loader.h"
#include "chromeos/chromeos_paths.h"
@@ -746,11 +747,16 @@ void ChromeMainDelegate::PreSandboxStartup() {
#endif
#if defined(OS_CHROMEOS)
- // Read and cache ChromeOS version from file,
- // to be used from inside the sandbox.
+ // Read and cache ChromeOS version, to be used from inside the sandbox.
int32 major_version, minor_version, bugfix_version;
base::SysInfo::OperatingSystemVersionNumbers(
pneubeck (no reviews) 2013/09/24 07:44:51 This call assumes more about the SysInfo implement
stevenjb 2013/09/24 17:18:34 I actually don't know why this was put here and di
&major_version, &minor_version, &bugfix_version);
+ std::string lsb_source;
+ base::SysInfo::GetLsbReleaseValue("lsb-source", &lsb_source);
+ VLOG(1) << "lsb-release source: " << lsb_source;
+ VLOG(1) << "lsb-release time: "
+ << base::TimeFormatShortDateAndTime(
+ base::SysInfo::GetLsbReleaseTime());
Daniel Erat 2013/09/24 15:37:53 nit: indenting one space seems strange -- indent f
stevenjb 2013/09/24 17:18:34 Removed.
#endif
}

Powered by Google App Engine
This is Rietveld 408576698