diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 20:28:42 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 20:28:42 +0000 |
| commit | 0211f57eabdc1a3e34aee1e1629c26e93b803ded (patch) | |
| tree | 3bcbab3506e5f3dbcbc99825529cc803d223b017 /chrome_frame | |
| parent | 1f8322043d302eb0f6a050a21d2f0f9a8c1df71e (diff) | |
| download | chromium_src-0211f57eabdc1a3e34aee1e1629c26e93b803ded.zip chromium_src-0211f57eabdc1a3e34aee1e1629c26e93b803ded.tar.gz chromium_src-0211f57eabdc1a3e34aee1e1629c26e93b803ded.tar.bz2 | |
Refactor version-getting info into a chrome::VersionInfo object.
I was trying to replace wstring usage in base::FileVersionInfo, but
that class is rather Windows-specific with strange fields like
"private_build()" where the value and encoding aren't clear. 95%
of the users of FileVersionInfo actually just care about the current
Chrome version, so we can provide a much simpler interface for them.
We still use FileVersionInfo for retrieving information from e.g.
plugin DLLs, but in those cases the usage is clearer.
Review URL: http://codereview.chromium.org/3135028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/metrics_service.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index bac5005..9258112 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -462,14 +462,13 @@ bool MetricsService::UploadData() { // static std::string MetricsService::GetVersionString() { - scoped_ptr<FileVersionInfo> version_info( - chrome::GetChromeVersionInfo()); - if (version_info.get()) { - std::string version = WideToUTF8(version_info->product_version()); + chrome::VersionInfo version_info; + if (version_info.is_valid()) { + std::string version = version_info.Version(); // Add the -F extensions to ensure that UMA data uploaded by ChromeFrame // lands in the ChromeFrame bucket. version += "-F"; - if (!version_info->is_official_build()) + if (!version_info.IsOfficialBuild()) version.append("-devel"); return version; } else { |