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

Unified Diff: chrome/browser/chromeos/system/statistics_provider.cc

Issue 8883043: Chrome version info getter for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | « no previous file | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/statistics_provider.cc
===================================================================
--- chrome/browser/chromeos/system/statistics_provider.cc (revision 114172)
+++ chrome/browser/chromeos/system/statistics_provider.cc (working copy)
@@ -14,6 +14,7 @@
#include "base/time.h"
#include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
#include "chrome/browser/chromeos/system/runtime_environment.h"
+#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
@@ -151,6 +152,20 @@
kMachineOSInfoDelim);
GetNameValuePairsFromFile(&parser, FilePath(kVpdFile), kVpdEq, kVpdDelim);
+#if defined(GOOGLE_CHROME_BUILD)
+ // TODO(kochi): This is for providing a channel information to
+ // chrome::VersionInfo::GetChannel()/GetVersionStringModifier(),
+ // but this is still late for some early customers such as
+ // prerender::ConfigurePrefetchAndPrerender() and
+ // ThreadWatcherList::ParseCommandLine().
+ // See http://crbug.com/107333 .
+ const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK";
+ std::string channel;
+ if (GetMachineStatistic(kChromeOSReleaseTrack, &channel)) {
+ chrome::VersionInfo::SetChannel(channel);
+ }
+#endif
+
// Finished loading the statistics.
on_statistics_loaded_.Signal();
VLOG(1) << "Finished loading statistics";
« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698