| 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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); | 675 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); |
| 676 } | 676 } |
| 677 | 677 |
| 678 if (parsed_command_line_.HasSwitch( | 678 if (parsed_command_line_.HasSwitch( |
| 679 switches::kEnableAggressiveDOMStorageFlushing)) { | 679 switches::kEnableAggressiveDOMStorageFlushing)) { |
| 680 TRACE_EVENT0("startup", | 680 TRACE_EVENT0("startup", |
| 681 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); | 681 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); |
| 682 DOMStorageArea::EnableAggressiveCommitDelay(); | 682 DOMStorageArea::EnableAggressiveCommitDelay(); |
| 683 } | 683 } |
| 684 | 684 |
| 685 GeolocationProvider::SetGeolocationDelegate( | |
| 686 GetContentClient()->browser()->CreateGeolocationDelegate()); | |
| 687 | |
| 688 // Enable memory-infra dump providers. | 685 // Enable memory-infra dump providers. |
| 689 InitSkiaEventTracer(); | 686 InitSkiaEventTracer(); |
| 690 tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( | 687 tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( |
| 691 base::kNullProcessId); | 688 base::kNullProcessId); |
| 692 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 689 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 693 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr); | 690 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr); |
| 694 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 691 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 695 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); | 692 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); |
| 696 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 693 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 697 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr); | 694 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr); |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1518 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1515 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1519 audio_thread_->task_runner(); | 1516 audio_thread_->task_runner(); |
| 1520 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1517 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1521 std::move(worker_task_runner), | 1518 std::move(worker_task_runner), |
| 1522 MediaInternals::GetInstance()); | 1519 MediaInternals::GetInstance()); |
| 1523 } | 1520 } |
| 1524 CHECK(audio_manager_); | 1521 CHECK(audio_manager_); |
| 1525 } | 1522 } |
| 1526 | 1523 |
| 1527 } // namespace content | 1524 } // namespace content |
| OLD | NEW |