| 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 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 802 #if defined(OS_MACOSX) | 802 #if defined(OS_MACOSX) |
| 803 if (BootstrapSandboxManager::ShouldEnable()) { | 803 if (BootstrapSandboxManager::ShouldEnable()) { |
| 804 TRACE_EVENT0("startup", | 804 TRACE_EVENT0("startup", |
| 805 "BrowserMainLoop::Subsystem:BootstrapSandbox"); | 805 "BrowserMainLoop::Subsystem:BootstrapSandbox"); |
| 806 CHECK(BootstrapSandboxManager::GetInstance()); | 806 CHECK(BootstrapSandboxManager::GetInstance()); |
| 807 } | 807 } |
| 808 #endif | 808 #endif |
| 809 | 809 |
| 810 #if defined(USE_OZONE) | 810 #if defined(USE_OZONE) |
| 811 client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); | 811 client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); |
| 812 ui::ClientNativePixmapFactory::SetInstance( | 812 gfx::ClientNativePixmapFactory::SetInstance( |
| 813 client_native_pixmap_factory_.get()); | 813 client_native_pixmap_factory_.get()); |
| 814 #endif | 814 #endif |
| 815 | 815 |
| 816 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { | 816 if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) { |
| 817 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); | 817 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver"); |
| 818 memory_observer_.reset(new MemoryObserver()); | 818 memory_observer_.reset(new MemoryObserver()); |
| 819 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); | 819 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); |
| 820 } | 820 } |
| 821 | 821 |
| 822 if (parsed_command_line_.HasSwitch( | 822 if (parsed_command_line_.HasSwitch( |
| (...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1783 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1783 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 1784 MediaInternals::GetInstance()); | 1784 MediaInternals::GetInstance()); |
| 1785 } | 1785 } |
| 1786 CHECK(audio_manager_); | 1786 CHECK(audio_manager_); |
| 1787 | 1787 |
| 1788 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1788 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1789 CHECK(audio_system_); | 1789 CHECK(audio_system_); |
| 1790 } | 1790 } |
| 1791 | 1791 |
| 1792 } // namespace content | 1792 } // namespace content |
| OLD | NEW |