chrome/browser/chromeos/status/memory_menu_button.cc - Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes.

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/chromeos/status/memory_menu_button.cc

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Rebasec Created 8 years, 10 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chromeos/status/memory_menu_button.cc

diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc

index 3a14554e73600ed47630b4e722e482fa2f3190da..696261e1e9b029127b365b2f6cc7c9108c08620d 100644

--- a/chrome/browser/chromeos/status/memory_menu_button.cc

+++ b/chrome/browser/chromeos/status/memory_menu_button.cc

@@ -24,7 +24,7 @@

#include "ui/views/widget/widget.h"

#if defined(USE_TCMALLOC)

-#include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"

+#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"

#endif

#if defined(USE_TCMALLOC)

« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/memory_purger.cc » ('j') | no next file with comments »