summaryrefslogtreecommitdiffstats
path: root/chrome/browser/memory_details_mac.cc
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 00:31:30 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 00:31:30 +0000
commitd9cb161850584e5d277b141aadb68abec0af28bb (patch)
tree52cdb82bc14b488f7c93edcaa018550fcd8c9cc3 /chrome/browser/memory_details_mac.cc
parent92f132ae9e06a0f55d65b44a324ac74b53a2945d (diff)
downloadchromium_src-d9cb161850584e5d277b141aadb68abec0af28bb.zip
chromium_src-d9cb161850584e5d277b141aadb68abec0af28bb.tar.gz
chromium_src-d9cb161850584e5d277b141aadb68abec0af28bb.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details_mac.cc')
-rw-r--r--chrome/browser/memory_details_mac.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc
index b17d25f..08fced1 100644
--- a/chrome/browser/memory_details_mac.cc
+++ b/chrome/browser/memory_details_mac.cc
@@ -201,13 +201,8 @@ void MemoryDetails::CollectProcessDataChrome(
info.type = ChildProcessInfo::UNKNOWN_PROCESS;
chrome::VersionInfo version_info;
- 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"";
- }
+ info.product_name = ASCIIToWide(version_info.Name());
+ 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.