base/debug/profiler.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: base/debug/profiler.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: Rebased. 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: base/debug/profiler.cc

diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc

index be442cf1fd66fc981ebd352bc6601c7b1a7a4fa0..dc86b122d4b5979285cc6446feb70fd90f816b47 100644

--- a/base/debug/profiler.cc

+++ b/base/debug/profiler.cc

@@ -11,7 +11,7 @@

#include "base/stringprintf.h"

#if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)

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

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

#endif

namespace base {

« no previous file with comments | « base/debug/leak_annotations.h ('k') | chrome/browser/browser_about_handler.cc » ('j') | third_party/tcmalloc/chromium/src/base/googleinit.h » ('J')