diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-16 21:29:58 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-16 21:29:58 +0000 |
| commit | 1180a85e0e75826b2156caf2049d5663be6956fd (patch) | |
| tree | 2bed8ad480a187bc63cc568e9cd2ca7dff401168 /base/file_version_info_mac.mm | |
| parent | 4207482503851f47b4f84943b6d6daabc244e30b (diff) | |
| download | chromium_src-1180a85e0e75826b2156caf2049d5663be6956fd.zip chromium_src-1180a85e0e75826b2156caf2049d5663be6956fd.tar.gz chromium_src-1180a85e0e75826b2156caf2049d5663be6956fd.tar.bz2 | |
Minor tweaks to deal with the split between CFBundleVersion
(which has numerical limits) and Chrome version (which does not).
Use Chrome version when we can.
Review URL: http://codereview.chromium.org/79021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_version_info_mac.mm')
| -rw-r--r-- | base/file_version_info_mac.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm index 3813cc6..00f470b 100644 --- a/base/file_version_info_mac.mm +++ b/base/file_version_info_mac.mm @@ -86,7 +86,12 @@ std::wstring FileVersionInfo::private_build() { } std::wstring FileVersionInfo::file_version() { - return GetStringValue(L"CFBundleVersion"); + // CFBundleVersion has limitations that may not be honored by a + // proper Chromium version number, so try KSVersion first. + std::wstring version = GetStringValue(L"KSVersion"); + if (version == L"") + version = GetStringValue(L"CFBundleVersion"); + return version; } std::wstring FileVersionInfo::original_filename() { |