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

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

Issue 1469843002: Remove dependency on allocator from 'content' targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unify_allocator1_2
Patch Set: Fix build Created 5 years 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/feature_list.h" 9 #include "base/feature_list.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 InitSkiaEventTracer(); 676 InitSkiaEventTracer();
677 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 677 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
678 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr); 678 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr);
679 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 679 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
680 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); 680 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
681 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 681 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
682 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr); 682 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr);
683 683
684 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) 684 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
685 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( 685 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController(
686 base::MessageLoop::current()->task_runner(), 686 base::MessageLoop::current()->task_runner()));
687 ::HeapProfilerWithPseudoStackStart, ::HeapProfilerStop,
688 ::GetHeapProfile));
689 #endif 687 #endif
690 } 688 }
691 689
692 int BrowserMainLoop::PreCreateThreads() { 690 int BrowserMainLoop::PreCreateThreads() {
693 if (parts_) { 691 if (parts_) {
694 TRACE_EVENT0("startup", 692 TRACE_EVENT0("startup",
695 "BrowserMainLoop::CreateThreads:PreCreateThreads"); 693 "BrowserMainLoop::CreateThreads:PreCreateThreads");
696 TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::PreCreateThreads"); 694 TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::PreCreateThreads");
697 695
698 result_code_ = parts_->PreCreateThreads(); 696 result_code_ = parts_->PreCreateThreads();
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 DCHECK(is_tracing_startup_for_duration_); 1447 DCHECK(is_tracing_startup_for_duration_);
1450 1448
1451 is_tracing_startup_for_duration_ = false; 1449 is_tracing_startup_for_duration_ = false;
1452 TracingController::GetInstance()->StopTracing( 1450 TracingController::GetInstance()->StopTracing(
1453 TracingController::CreateFileSink( 1451 TracingController::CreateFileSink(
1454 startup_trace_file_, 1452 startup_trace_file_,
1455 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1453 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1456 } 1454 }
1457 1455
1458 } // namespace content 1456 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698