| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 #include "media/audio/audio_system_impl.h" | 96 #include "media/audio/audio_system_impl.h" |
| 97 #include "media/base/media.h" | 97 #include "media/base/media.h" |
| 98 #include "media/base/user_input_monitor.h" | 98 #include "media/base/user_input_monitor.h" |
| 99 #include "media/midi/midi_service.h" | 99 #include "media/midi/midi_service.h" |
| 100 #include "mojo/edk/embedder/embedder.h" | 100 #include "mojo/edk/embedder/embedder.h" |
| 101 #include "mojo/edk/embedder/scoped_ipc_support.h" | 101 #include "mojo/edk/embedder/scoped_ipc_support.h" |
| 102 #include "net/base/network_change_notifier.h" | 102 #include "net/base/network_change_notifier.h" |
| 103 #include "net/socket/client_socket_factory.h" | 103 #include "net/socket/client_socket_factory.h" |
| 104 #include "net/ssl/ssl_config_service.h" | 104 #include "net/ssl/ssl_config_service.h" |
| 105 #include "ppapi/features/features.h" | 105 #include "ppapi/features/features.h" |
| 106 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" |
| 106 #include "services/service_manager/runner/common/client_util.h" | 107 #include "services/service_manager/runner/common/client_util.h" |
| 107 #include "skia/ext/event_tracer_impl.h" | 108 #include "skia/ext/event_tracer_impl.h" |
| 108 #include "skia/ext/skia_memory_dump_provider.h" | 109 #include "skia/ext/skia_memory_dump_provider.h" |
| 109 #include "sql/sql_memory_dump_provider.h" | 110 #include "sql/sql_memory_dump_provider.h" |
| 110 #include "ui/base/clipboard/clipboard.h" | 111 #include "ui/base/clipboard/clipboard.h" |
| 111 #include "ui/gfx/switches.h" | 112 #include "ui/gfx/switches.h" |
| 112 | 113 |
| 113 #if defined(USE_AURA) || defined(OS_MACOSX) | 114 #if defined(USE_AURA) || defined(OS_MACOSX) |
| 114 #include "content/browser/compositor/image_transport_factory.h" | 115 #include "content/browser/compositor/image_transport_factory.h" |
| 115 #endif | 116 #endif |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 } | 821 } |
| 821 | 822 |
| 822 if (parsed_command_line_.HasSwitch( | 823 if (parsed_command_line_.HasSwitch( |
| 823 switches::kEnableAggressiveDOMStorageFlushing)) { | 824 switches::kEnableAggressiveDOMStorageFlushing)) { |
| 824 TRACE_EVENT0("startup", | 825 TRACE_EVENT0("startup", |
| 825 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); | 826 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); |
| 826 DOMStorageArea::EnableAggressiveCommitDelay(); | 827 DOMStorageArea::EnableAggressiveCommitDelay(); |
| 827 LevelDBWrapperImpl::EnableAggressiveCommitDelay(); | 828 LevelDBWrapperImpl::EnableAggressiveCommitDelay(); |
| 828 } | 829 } |
| 829 | 830 |
| 831 // Create the memory instrumentation service. It will initialize the memory |
| 832 // dump manager, too. |
| 833 memory_instrumentation::CoordinatorImpl::GetInstance(); |
| 834 |
| 830 // Enable memory-infra dump providers. | 835 // Enable memory-infra dump providers. |
| 831 InitSkiaEventTracer(); | 836 InitSkiaEventTracer(); |
| 832 tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( | 837 tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( |
| 833 base::kNullProcessId); | 838 base::kNullProcessId); |
| 834 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 839 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 835 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr); | 840 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr); |
| 836 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 841 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 837 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); | 842 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); |
| 838 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 843 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 839 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr); | 844 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr); |
| (...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1781 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1786 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 1782 MediaInternals::GetInstance()); | 1787 MediaInternals::GetInstance()); |
| 1783 } | 1788 } |
| 1784 CHECK(audio_manager_); | 1789 CHECK(audio_manager_); |
| 1785 | 1790 |
| 1786 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1791 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1787 CHECK(audio_system_); | 1792 CHECK(audio_system_); |
| 1788 } | 1793 } |
| 1789 | 1794 |
| 1790 } // namespace content | 1795 } // namespace content |
| OLD | NEW |