chrome/browser/process_info_snapshot_mac.cc - Issue 7144007: Improve and unify Mac OS X run-time version checks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/process_info_snapshot_mac.cc

Issue 7144007: Improve and unify Mac OS X run-time version checks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/process_info_snapshot_mac.cc

===================================================================

--- chrome/browser/process_info_snapshot_mac.cc (revision 88826)

+++ chrome/browser/process_info_snapshot_mac.cc (working copy)

@@ -10,9 +10,9 @@

#include "base/command_line.h"

#include "base/logging.h"

+#include "base/mac/mac_util.h"

#include "base/string_number_conversions.h"

#include "base/string_util.h"

-#include "base/sys_info.h"

#include "base/threading/thread.h"

// Default constructor.

@@ -380,11 +380,9 @@

// Get memory information using top.

bool memory_info_success = false;

- int32 major, minor, bugfix;

- base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);

- if (major == 10 && minor == 5)

+ if (base::mac::IsOSLeopardOrEarlier())

memory_info_success = GetProcessMemoryInfoUsingTop_10_5(proc_info_entries_);

- else if ((major == 10 && minor >= 6) || major > 10)

+ else

memory_info_success = GetProcessMemoryInfoUsingTop(proc_info_entries_);

// If top didn't work then fall back to ps.

« no previous file with comments | « chrome/browser/bug_report_util.cc ('k') | chrome/browser/ui/cocoa/objc_zombie.mm » ('j') | no next file with comments »