diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
| commit | 347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8 (patch) | |
| tree | 9225b2ce830d701121dcc56dc30db0eb6bf6af71 /www/chromium/files/patch-chrome__browser__memory_details.cc | |
| parent | - Upgrade to 0.010002. (diff) | |
www/chromium: update to 39.0.2171.65
MFH: 2014Q4
Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee
Diffstat (limited to 'www/chromium/files/patch-chrome__browser__memory_details.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome__browser__memory_details.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc index 60a9c0d76b14..b9db31ecd43f 100644 --- a/www/chromium/files/patch-chrome__browser__memory_details.cc +++ b/www/chromium/files/patch-chrome__browser__memory_details.cc @@ -1,7 +1,7 @@ ---- chrome/browser/memory_details.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/memory_details.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/memory_details.cc -@@ -27,7 +27,7 @@ - #include "grit/generated_resources.h" +@@ -26,7 +26,7 @@ + #include "content/public/common/bindings_policy.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -248,7 +248,7 @@ +@@ -247,7 +247,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -18,7 +18,7 @@ const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); #endif -@@ -390,7 +390,7 @@ +@@ -389,7 +389,7 @@ } } |