| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 120 |
| 121 #if defined(OS_ANDROID) | 121 #if defined(OS_ANDROID) |
| 122 #include "base/android/jni_android.h" | 122 #include "base/android/jni_android.h" |
| 123 #include "components/tracing/common/graphics_memory_dump_provider_android.h" | 123 #include "components/tracing/common/graphics_memory_dump_provider_android.h" |
| 124 #include "content/browser/android/browser_startup_controller.h" | 124 #include "content/browser/android/browser_startup_controller.h" |
| 125 #include "content/browser/android/scoped_surface_request_manager.h" | 125 #include "content/browser/android/scoped_surface_request_manager.h" |
| 126 #include "content/browser/android/tracing_controller_android.h" | 126 #include "content/browser/android/tracing_controller_android.h" |
| 127 #include "content/browser/media/android/browser_media_player_manager.h" | 127 #include "content/browser/media/android/browser_media_player_manager.h" |
| 128 #include "content/browser/renderer_host/context_provider_factory_impl_android.h" | 128 #include "content/browser/renderer_host/context_provider_factory_impl_android.h" |
| 129 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" | 129 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" |
| 130 #include "content/public/browser/screen_orientation_provider.h" | |
| 131 #include "media/base/android/media_client_android.h" | 130 #include "media/base/android/media_client_android.h" |
| 132 #include "ui/android/screen_android.h" | 131 #include "ui/android/screen_android.h" |
| 133 #include "ui/display/screen.h" | 132 #include "ui/display/screen.h" |
| 134 #include "ui/gl/gl_surface.h" | 133 #include "ui/gl/gl_surface.h" |
| 135 #endif | 134 #endif |
| 136 | 135 |
| 137 #if defined(OS_MACOSX) | 136 #if defined(OS_MACOSX) |
| 138 #include "base/memory/memory_pressure_monitor_mac.h" | 137 #include "base/memory/memory_pressure_monitor_mac.h" |
| 139 #include "content/browser/bootstrap_sandbox_manager_mac.h" | 138 #include "content/browser/bootstrap_sandbox_manager_mac.h" |
| 140 #include "content/browser/cocoa/system_hotkey_helper_mac.h" | 139 #include "content/browser/cocoa/system_hotkey_helper_mac.h" |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 } | 788 } |
| 790 BrowserMediaPlayerManager::InitSurfaceTexturePeer(); | 789 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()); | |
| 800 } | 798 } |
| 801 #endif | 799 #endif |
| 802 | 800 |
| 803 #if defined(OS_MACOSX) | 801 #if defined(OS_MACOSX) |
| 804 if (BootstrapSandboxManager::ShouldEnable()) { | 802 if (BootstrapSandboxManager::ShouldEnable()) { |
| 805 TRACE_EVENT0("startup", | 803 TRACE_EVENT0("startup", |
| 806 "BrowserMainLoop::Subsystem:BootstrapSandbox"); | 804 "BrowserMainLoop::Subsystem:BootstrapSandbox"); |
| 807 CHECK(BootstrapSandboxManager::GetInstance()); | 805 CHECK(BootstrapSandboxManager::GetInstance()); |
| 808 } | 806 } |
| 809 #endif | 807 #endif |
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1799 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), | 1797 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), |
| 1800 MediaInternals::GetInstance()); | 1798 MediaInternals::GetInstance()); |
| 1801 } | 1799 } |
| 1802 CHECK(audio_manager_); | 1800 CHECK(audio_manager_); |
| 1803 | 1801 |
| 1804 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1802 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1805 CHECK(audio_system_); | 1803 CHECK(audio_system_); |
| 1806 } | 1804 } |
| 1807 | 1805 |
| 1808 } // namespace content | 1806 } // namespace content |
| OLD | NEW |