| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 #endif | 121 #endif |
| 122 | 122 |
| 123 #if defined(OS_ANDROID) | 123 #if defined(OS_ANDROID) |
| 124 #include "base/android/jni_android.h" | 124 #include "base/android/jni_android.h" |
| 125 #include "components/tracing/common/graphics_memory_dump_provider_android.h" | 125 #include "components/tracing/common/graphics_memory_dump_provider_android.h" |
| 126 #include "content/browser/android/browser_startup_controller.h" | 126 #include "content/browser/android/browser_startup_controller.h" |
| 127 #include "content/browser/android/scoped_surface_request_manager.h" | 127 #include "content/browser/android/scoped_surface_request_manager.h" |
| 128 #include "content/browser/android/tracing_controller_android.h" | 128 #include "content/browser/android/tracing_controller_android.h" |
| 129 #include "content/browser/media/android/browser_media_player_manager.h" | 129 #include "content/browser/media/android/browser_media_player_manager.h" |
| 130 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" | 130 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" |
| 131 #include "media/base/android/media_client_android.h" | 131 #include "media/base/android/media_drm_bridge_client.h" |
| 132 #include "ui/android/screen_android.h" | 132 #include "ui/android/screen_android.h" |
| 133 #include "ui/display/screen.h" | 133 #include "ui/display/screen.h" |
| 134 #include "ui/gl/gl_surface.h" | 134 #include "ui/gl/gl_surface.h" |
| 135 #endif | 135 #endif |
| 136 | 136 |
| 137 #if defined(OS_MACOSX) | 137 #if defined(OS_MACOSX) |
| 138 #include "base/memory/memory_pressure_monitor_mac.h" | 138 #include "base/memory/memory_pressure_monitor_mac.h" |
| 139 #include "content/browser/bootstrap_sandbox_manager_mac.h" | 139 #include "content/browser/bootstrap_sandbox_manager_mac.h" |
| 140 #include "content/browser/cocoa/system_hotkey_helper_mac.h" | 140 #include "content/browser/cocoa/system_hotkey_helper_mac.h" |
| 141 #include "content/browser/mach_broker_mac.h" | 141 #include "content/browser/mach_broker_mac.h" |
| (...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1585 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, | 1585 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, |
| 1586 true /* force_create */)); | 1586 true /* force_create */)); |
| 1587 } | 1587 } |
| 1588 | 1588 |
| 1589 #if defined(OS_MACOSX) | 1589 #if defined(OS_MACOSX) |
| 1590 ThemeHelperMac::GetInstance(); | 1590 ThemeHelperMac::GetInstance(); |
| 1591 SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys(); | 1591 SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys(); |
| 1592 #endif // defined(OS_MACOSX) | 1592 #endif // defined(OS_MACOSX) |
| 1593 | 1593 |
| 1594 #if defined(OS_ANDROID) | 1594 #if defined(OS_ANDROID) |
| 1595 media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid()); | 1595 media::SetMediaDrmBridgeClient(GetContentClient()->GetMediaDrmBridgeClient()); |
| 1596 #endif | 1596 #endif |
| 1597 | 1597 |
| 1598 return result_code_; | 1598 return result_code_; |
| 1599 } | 1599 } |
| 1600 | 1600 |
| 1601 bool BrowserMainLoop::UsingInProcessGpu() const { | 1601 bool BrowserMainLoop::UsingInProcessGpu() const { |
| 1602 return parsed_command_line_.HasSwitch(switches::kSingleProcess) || | 1602 return parsed_command_line_.HasSwitch(switches::kSingleProcess) || |
| 1603 parsed_command_line_.HasSwitch(switches::kInProcessGPU); | 1603 parsed_command_line_.HasSwitch(switches::kInProcessGPU); |
| 1604 } | 1604 } |
| 1605 | 1605 |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1792 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1792 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 1793 MediaInternals::GetInstance()); | 1793 MediaInternals::GetInstance()); |
| 1794 } | 1794 } |
| 1795 CHECK(audio_manager_); | 1795 CHECK(audio_manager_); |
| 1796 | 1796 |
| 1797 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1797 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1798 CHECK(audio_system_); | 1798 CHECK(audio_system_); |
| 1799 } | 1799 } |
| 1800 | 1800 |
| 1801 } // namespace content | 1801 } // namespace content |
| OLD | NEW |