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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 1632253002: Allocator cleanup: remove CHROME_PROFILER_TIME and rotten tcmalloc deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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 unified diff | Download patch
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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 #if !defined(OS_ANDROID) 157 #if !defined(OS_ANDROID)
158 #include "content/browser/ppapi_plugin_process_host.h" 158 #include "content/browser/ppapi_plugin_process_host.h"
159 #endif 159 #endif
160 #endif 160 #endif
161 161
162 #if defined(ENABLE_PLUGINS) 162 #if defined(ENABLE_PLUGINS)
163 #include "content/browser/plugin_service_impl.h" 163 #include "content/browser/plugin_service_impl.h"
164 #endif 164 #endif
165 165
166 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
167 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
168 #endif
169
170 #if defined(USE_X11) 166 #if defined(USE_X11)
171 #include "ui/base/x/x11_util_internal.h" 167 #include "ui/base/x/x11_util_internal.h"
172 #include "ui/gfx/x/x11_connection.h" 168 #include "ui/gfx/x/x11_connection.h"
173 #include "ui/gfx/x/x11_switches.h" 169 #include "ui/gfx/x/x11_switches.h"
174 #include "ui/gfx/x/x11_types.h" 170 #include "ui/gfx/x/x11_types.h"
175 #endif 171 #endif
176 172
177 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) 173 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL)
178 #include "crypto/nss_util.h" 174 #include "crypto/nss_util.h"
179 #endif 175 #endif
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1465 DCHECK(is_tracing_startup_for_duration_); 1461 DCHECK(is_tracing_startup_for_duration_);
1466 1462
1467 is_tracing_startup_for_duration_ = false; 1463 is_tracing_startup_for_duration_ = false;
1468 TracingController::GetInstance()->StopTracing( 1464 TracingController::GetInstance()->StopTracing(
1469 TracingController::CreateFileSink( 1465 TracingController::CreateFileSink(
1470 startup_trace_file_, 1466 startup_trace_file_,
1471 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1467 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1472 } 1468 }
1473 1469
1474 } // namespace content 1470 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698