diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:40:17 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:40:17 +0000 |
| commit | 30c918084bac874b6cfaabb93f0bb2545c5354e2 (patch) | |
| tree | 45bd81ec93407433426c0a6d1421bc189a96c2c4 /chrome/browser/memory_details_mac.cc | |
| parent | d9cb161850584e5d277b141aadb68abec0af28bb (diff) | |
| download | chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.zip chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.tar.gz chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.tar.bz2 | |
Revert 69592 - file_version_info was not finding Mac values correctly.
Changed file_version_info to find Mac values, and changed version_info to fail if values can't be found.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/5815001
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/6017003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details_mac.cc')
| -rw-r--r-- | chrome/browser/memory_details_mac.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index 08fced1..b17d25f 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -201,8 +201,13 @@ void MemoryDetails::CollectProcessDataChrome( info.type = ChildProcessInfo::UNKNOWN_PROCESS; chrome::VersionInfo version_info; - info.product_name = ASCIIToWide(version_info.Name()); - info.version = ASCIIToWide(version_info.Version()); + if (version_info.is_valid()) { + info.product_name = ASCIIToWide(version_info.Name()); + info.version = ASCIIToWide(version_info.Version()); + } else { + info.product_name = process_data_[CHROME_BROWSER].name; + info.version = L""; + } // Check if this is one of the child processes whose data we collected // on the IO thread, and if so copy over that data. |