OLD | NEW |
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/location.h" | 9 #include "base/location.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 #include "content/public/common/result_codes.h" | 60 #include "content/public/common/result_codes.h" |
61 #include "crypto/nss_util.h" | 61 #include "crypto/nss_util.h" |
62 #include "device/battery/battery_status_service.h" | 62 #include "device/battery/battery_status_service.h" |
63 #include "media/audio/audio_manager.h" | 63 #include "media/audio/audio_manager.h" |
64 #include "media/base/media.h" | 64 #include "media/base/media.h" |
65 #include "media/base/user_input_monitor.h" | 65 #include "media/base/user_input_monitor.h" |
66 #include "media/midi/midi_manager.h" | 66 #include "media/midi/midi_manager.h" |
67 #include "net/base/network_change_notifier.h" | 67 #include "net/base/network_change_notifier.h" |
68 #include "net/socket/client_socket_factory.h" | 68 #include "net/socket/client_socket_factory.h" |
69 #include "net/ssl/ssl_config_service.h" | 69 #include "net/ssl/ssl_config_service.h" |
| 70 #include "skia/ext/skia_memory_dump_provider.h" |
70 #include "ui/base/clipboard/clipboard.h" | 71 #include "ui/base/clipboard/clipboard.h" |
71 | 72 |
72 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) | 73 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) |
73 #include "content/browser/compositor/image_transport_factory.h" | 74 #include "content/browser/compositor/image_transport_factory.h" |
74 #endif | 75 #endif |
75 | 76 |
76 #if defined(USE_AURA) | 77 #if defined(USE_AURA) |
77 #include "content/public/browser/context_factory.h" | 78 #include "content/public/browser/context_factory.h" |
78 #include "ui/aura/env.h" | 79 #include "ui/aura/env.h" |
79 #endif | 80 #endif |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 TRACE_EVENT0("startup", | 625 TRACE_EVENT0("startup", |
625 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); | 626 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); |
626 DOMStorageArea::EnableAggressiveCommitDelay(); | 627 DOMStorageArea::EnableAggressiveCommitDelay(); |
627 } | 628 } |
628 | 629 |
629 base::trace_event::MemoryDumpManager::GetInstance()->Initialize(); | 630 base::trace_event::MemoryDumpManager::GetInstance()->Initialize(); |
630 | 631 |
631 // Enable the dump providers. | 632 // Enable the dump providers. |
632 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 633 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
633 HostSharedBitmapManager::current()); | 634 HostSharedBitmapManager::current()); |
| 635 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 636 skia::SkiaMemoryDumpProvider::GetInstance()); |
634 | 637 |
635 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) | 638 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) |
636 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( | 639 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( |
637 base::MessageLoop::current()->task_runner(), | 640 base::MessageLoop::current()->task_runner(), |
638 ::HeapProfilerWithPseudoStackStart, ::HeapProfilerStop, | 641 ::HeapProfilerWithPseudoStackStart, ::HeapProfilerStop, |
639 ::GetHeapProfile)); | 642 ::GetHeapProfile)); |
640 #endif | 643 #endif |
641 } | 644 } |
642 | 645 |
643 int BrowserMainLoop::PreCreateThreads() { | 646 int BrowserMainLoop::PreCreateThreads() { |
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1345 DCHECK(is_tracing_startup_); | 1348 DCHECK(is_tracing_startup_); |
1346 | 1349 |
1347 is_tracing_startup_ = false; | 1350 is_tracing_startup_ = false; |
1348 TracingController::GetInstance()->DisableRecording( | 1351 TracingController::GetInstance()->DisableRecording( |
1349 TracingController::CreateFileSink( | 1352 TracingController::CreateFileSink( |
1350 startup_trace_file_, | 1353 startup_trace_file_, |
1351 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1354 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1352 } | 1355 } |
1353 | 1356 |
1354 } // namespace content | 1357 } // namespace content |
OLD | NEW |