Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Side by Side Diff: chrome/browser/browser_about_handler.cc

Issue 9666033: Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/debug/profiler.cc ('k') | chrome/browser/chromeos/status/memory_menu_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browser_about_handler.h" 5 #include "chrome/browser/browser_about_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "chrome/browser/net/url_fixer_upper.h" 13 #include "chrome/browser/net/url_fixer_upper.h"
14 #include "chrome/browser/ui/browser_dialogs.h" 14 #include "chrome/browser/ui/browser_dialogs.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
17 #include "content/public/browser/sensors_provider.h" 17 #include "content/public/browser/sensors_provider.h"
18 18
19 #if defined(USE_TCMALLOC) 19 #if defined(USE_TCMALLOC)
20 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" 20 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
21 #endif 21 #endif
22 22
23 namespace { 23 namespace {
24 24
25 // Add paths here to be included in chrome://chrome-urls (about:about). 25 // Add paths here to be included in chrome://chrome-urls (about:about).
26 // These paths will also be suggested by BuiltinProvider. 26 // These paths will also be suggested by BuiltinProvider.
27 const char* const kChromePaths[] = { 27 const char* const kChromePaths[] = {
28 chrome::kChromeUIAppCacheInternalsHost, 28 chrome::kChromeUIAppCacheInternalsHost,
29 chrome::kChromeUIBlobInternalsHost, 29 chrome::kChromeUIBlobInternalsHost,
30 chrome::kChromeUIBookmarksHost, 30 chrome::kChromeUIBookmarksHost,
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 AboutTcmallocOutputs::AboutTcmallocOutputs() {} 214 AboutTcmallocOutputs::AboutTcmallocOutputs() {}
215 215
216 AboutTcmallocOutputs::~AboutTcmallocOutputs() {} 216 AboutTcmallocOutputs::~AboutTcmallocOutputs() {}
217 217
218 // Glue between the callback task and the method in the singleton. 218 // Glue between the callback task and the method in the singleton.
219 void AboutTcmallocRendererCallback(base::ProcessId pid, 219 void AboutTcmallocRendererCallback(base::ProcessId pid,
220 const std::string& output) { 220 const std::string& output) {
221 AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output); 221 AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output);
222 } 222 }
223 #endif 223 #endif
OLDNEW
« no previous file with comments | « base/debug/profiler.cc ('k') | chrome/browser/chromeos/status/memory_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698