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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 #include "crypto/nss_util.h" | 63 #include "crypto/nss_util.h" |
64 #include "device/battery/battery_status_service.h" | 64 #include "device/battery/battery_status_service.h" |
65 #include "media/audio/audio_manager.h" | 65 #include "media/audio/audio_manager.h" |
66 #include "media/base/media.h" | 66 #include "media/base/media.h" |
67 #include "media/base/user_input_monitor.h" | 67 #include "media/base/user_input_monitor.h" |
68 #include "media/midi/midi_manager.h" | 68 #include "media/midi/midi_manager.h" |
69 #include "net/base/network_change_notifier.h" | 69 #include "net/base/network_change_notifier.h" |
70 #include "net/socket/client_socket_factory.h" | 70 #include "net/socket/client_socket_factory.h" |
71 #include "net/ssl/ssl_config_service.h" | 71 #include "net/ssl/ssl_config_service.h" |
72 #include "skia/ext/skia_memory_dump_provider.h" | 72 #include "skia/ext/skia_memory_dump_provider.h" |
| 73 #include "sql/process_memory_dump_provider.h" |
73 #include "ui/base/clipboard/clipboard.h" | 74 #include "ui/base/clipboard/clipboard.h" |
74 | 75 |
75 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) | 76 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) |
76 #include "content/browser/compositor/image_transport_factory.h" | 77 #include "content/browser/compositor/image_transport_factory.h" |
77 #endif | 78 #endif |
78 | 79 |
79 #if defined(USE_AURA) | 80 #if defined(USE_AURA) |
80 #include "content/public/browser/context_factory.h" | 81 #include "content/public/browser/context_factory.h" |
81 #include "ui/aura/env.h" | 82 #include "ui/aura/env.h" |
82 #endif | 83 #endif |
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
642 DOMStorageArea::EnableAggressiveCommitDelay(); | 643 DOMStorageArea::EnableAggressiveCommitDelay(); |
643 } | 644 } |
644 | 645 |
645 base::trace_event::MemoryDumpManager::GetInstance()->Initialize(); | 646 base::trace_event::MemoryDumpManager::GetInstance()->Initialize(); |
646 | 647 |
647 // Enable the dump providers. | 648 // Enable the dump providers. |
648 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 649 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
649 HostSharedBitmapManager::current()); | 650 HostSharedBitmapManager::current()); |
650 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 651 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
651 skia::SkiaMemoryDumpProvider::GetInstance()); | 652 skia::SkiaMemoryDumpProvider::GetInstance()); |
| 653 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 654 sql::ProcessMemoryDumpProvider::GetInstance()); |
652 | 655 |
653 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) | 656 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) |
654 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( | 657 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( |
655 base::MessageLoop::current()->task_runner(), | 658 base::MessageLoop::current()->task_runner(), |
656 ::HeapProfilerWithPseudoStackStart, ::HeapProfilerStop, | 659 ::HeapProfilerWithPseudoStackStart, ::HeapProfilerStop, |
657 ::GetHeapProfile)); | 660 ::GetHeapProfile)); |
658 #endif | 661 #endif |
659 } | 662 } |
660 | 663 |
661 int BrowserMainLoop::PreCreateThreads() { | 664 int BrowserMainLoop::PreCreateThreads() { |
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1382 DCHECK(is_tracing_startup_for_duration_); | 1385 DCHECK(is_tracing_startup_for_duration_); |
1383 | 1386 |
1384 is_tracing_startup_for_duration_ = false; | 1387 is_tracing_startup_for_duration_ = false; |
1385 TracingController::GetInstance()->DisableRecording( | 1388 TracingController::GetInstance()->DisableRecording( |
1386 TracingController::CreateFileSink( | 1389 TracingController::CreateFileSink( |
1387 startup_trace_file_, | 1390 startup_trace_file_, |
1388 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1391 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1389 } | 1392 } |
1390 | 1393 |
1391 } // namespace content | 1394 } // namespace content |
OLD | NEW |