| commit | 30c918084bac874b6cfaabb93f0bb2545c5354e2 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Dec 18 00:40:17 2010 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Dec 18 00:40:17 2010 |
| tree | 45bd81ec93407433426c0a6d1421bc189a96c2c4 | |
| parent | d9cb161850584e5d277b141aadb68abec0af28bb [diff] [blame] |
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 [email protected] Review URL: http://codereview.chromium.org/6017003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69601 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index a3ea337..959cebd 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc
@@ -121,7 +121,8 @@ TCHAR name[MAX_PATH]; if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) { chrome::VersionInfo version_info; - info.version = ASCIIToWide(version_info.Version()); + if (version_info.is_valid()) + info.version = ASCIIToWide(version_info.Version()); // Check if this is one of the child processes whose data we collected // on the IO thread, and if so copy over that data. for (size_t child = 0; child < child_info.size(); child++) {