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