| 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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 } | 780 } |
| 781 | 781 |
| 782 #if defined(OS_ANDROID) | 782 #if defined(OS_ANDROID) |
| 783 { | 783 { |
| 784 TRACE_EVENT0("startup", | 784 TRACE_EVENT0("startup", |
| 785 "BrowserMainLoop::Subsystem:BrowserMediaPlayerManager"); | 785 "BrowserMainLoop::Subsystem:BrowserMediaPlayerManager"); |
| 786 if (UsingInProcessGpu()) { | 786 if (UsingInProcessGpu()) { |
| 787 gpu::ScopedSurfaceRequestConduit::SetInstance( | 787 gpu::ScopedSurfaceRequestConduit::SetInstance( |
| 788 ScopedSurfaceRequestManager::GetInstance()); | 788 ScopedSurfaceRequestManager::GetInstance()); |
| 789 } | 789 } |
| 790 BrowserMediaPlayerManager::InitSurfaceTexturePeer(); | |
| 791 } | 790 } |
| 792 | 791 |
| 793 if (!parsed_command_line_.HasSwitch( | 792 if (!parsed_command_line_.HasSwitch( |
| 794 switches::kDisableScreenOrientationLock)) { | 793 switches::kDisableScreenOrientationLock)) { |
| 795 TRACE_EVENT0("startup", | 794 TRACE_EVENT0("startup", |
| 796 "BrowserMainLoop::Subsystem:ScreenOrientationProvider"); | 795 "BrowserMainLoop::Subsystem:ScreenOrientationProvider"); |
| 797 screen_orientation_delegate_.reset( | 796 screen_orientation_delegate_.reset( |
| 798 new ScreenOrientationDelegateAndroid()); | 797 new ScreenOrientationDelegateAndroid()); |
| 799 ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get()); | 798 ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get()); |
| 800 } | 799 } |
| (...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1799 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), | 1798 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
| 1800 MediaInternals::GetInstance()); | 1799 MediaInternals::GetInstance()); |
| 1801 } | 1800 } |
| 1802 CHECK(audio_manager_); | 1801 CHECK(audio_manager_); |
| 1803 | 1802 |
| 1804 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1803 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1805 CHECK(audio_system_); | 1804 CHECK(audio_system_); |
| 1806 } | 1805 } |
| 1807 | 1806 |
| 1808 } // namespace content | 1807 } // namespace content |
| OLD | NEW |