| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #include "content/browser/webui/content_web_ui_controller_factory.h" | 65 #include "content/browser/webui/content_web_ui_controller_factory.h" |
| 66 #include "content/browser/webui/url_data_manager.h" | 66 #include "content/browser/webui/url_data_manager.h" |
| 67 #include "content/common/content_switches_internal.h" | 67 #include "content/common/content_switches_internal.h" |
| 68 #include "content/common/host_discardable_shared_memory_manager.h" | 68 #include "content/common/host_discardable_shared_memory_manager.h" |
| 69 #include "content/common/host_shared_bitmap_manager.h" | 69 #include "content/common/host_shared_bitmap_manager.h" |
| 70 #include "content/common/mojo/mojo_shell_connection_impl.h" | 70 #include "content/common/mojo/mojo_shell_connection_impl.h" |
| 71 #include "content/public/browser/browser_main_parts.h" | 71 #include "content/public/browser/browser_main_parts.h" |
| 72 #include "content/public/browser/content_browser_client.h" | 72 #include "content/public/browser/content_browser_client.h" |
| 73 #include "content/public/browser/render_process_host.h" | 73 #include "content/public/browser/render_process_host.h" |
| 74 #include "content/public/browser/tracing_controller.h" | 74 #include "content/public/browser/tracing_controller.h" |
| 75 #include "content/public/common/content_client.h" |
| 75 #include "content/public/common/content_switches.h" | 76 #include "content/public/common/content_switches.h" |
| 76 #include "content/public/common/main_function_params.h" | 77 #include "content/public/common/main_function_params.h" |
| 77 #include "content/public/common/result_codes.h" | 78 #include "content/public/common/result_codes.h" |
| 78 #include "device/battery/battery_status_service.h" | 79 #include "device/battery/battery_status_service.h" |
| 79 #include "ipc/mojo/scoped_ipc_support.h" | 80 #include "ipc/mojo/scoped_ipc_support.h" |
| 80 #include "media/base/media.h" | 81 #include "media/base/media.h" |
| 81 #include "media/base/user_input_monitor.h" | 82 #include "media/base/user_input_monitor.h" |
| 82 #include "media/midi/midi_manager.h" | 83 #include "media/midi/midi_manager.h" |
| 83 #include "mojo/edk/embedder/embedder.h" | 84 #include "mojo/edk/embedder/embedder.h" |
| 84 #include "net/base/network_change_notifier.h" | 85 #include "net/base/network_change_notifier.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 101 #if defined(OS_ANDROID) | 102 #if defined(OS_ANDROID) |
| 102 #include "base/android/jni_android.h" | 103 #include "base/android/jni_android.h" |
| 103 #include "components/tracing/common/graphics_memory_dump_provider_android.h" | 104 #include "components/tracing/common/graphics_memory_dump_provider_android.h" |
| 104 #include "content/browser/android/browser_startup_controller.h" | 105 #include "content/browser/android/browser_startup_controller.h" |
| 105 #include "content/browser/android/browser_surface_texture_manager.h" | 106 #include "content/browser/android/browser_surface_texture_manager.h" |
| 106 #include "content/browser/android/tracing_controller_android.h" | 107 #include "content/browser/android/tracing_controller_android.h" |
| 107 #include "content/browser/media/android/browser_media_player_manager.h" | 108 #include "content/browser/media/android/browser_media_player_manager.h" |
| 108 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" | 109 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" |
| 109 #include "content/public/browser/screen_orientation_provider.h" | 110 #include "content/public/browser/screen_orientation_provider.h" |
| 110 #include "gpu/ipc/client/android/in_process_surface_texture_manager.h" | 111 #include "gpu/ipc/client/android/in_process_surface_texture_manager.h" |
| 112 #include "media/base/android/media_client_android.h" |
| 111 #include "ui/gl/gl_surface.h" | 113 #include "ui/gl/gl_surface.h" |
| 112 #endif | 114 #endif |
| 113 | 115 |
| 114 #if defined(OS_MACOSX) | 116 #if defined(OS_MACOSX) |
| 115 #include "base/memory/memory_pressure_monitor_mac.h" | 117 #include "base/memory/memory_pressure_monitor_mac.h" |
| 116 #include "content/browser/bootstrap_sandbox_manager_mac.h" | 118 #include "content/browser/bootstrap_sandbox_manager_mac.h" |
| 117 #include "content/browser/cocoa/system_hotkey_helper_mac.h" | 119 #include "content/browser/cocoa/system_hotkey_helper_mac.h" |
| 118 #include "content/browser/mach_broker_mac.h" | 120 #include "content/browser/mach_broker_mac.h" |
| 119 #include "content/browser/renderer_host/browser_compositor_view_mac.h" | 121 #include "content/browser/renderer_host/browser_compositor_view_mac.h" |
| 120 #include "content/browser/theme_helper_mac.h" | 122 #include "content/browser/theme_helper_mac.h" |
| (...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1323 base::Bind(base::IgnoreResult(&GpuProcessHost::Get), | 1325 base::Bind(base::IgnoreResult(&GpuProcessHost::Get), |
| 1324 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, | 1326 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, |
| 1325 CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP)); | 1327 CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP)); |
| 1326 } | 1328 } |
| 1327 | 1329 |
| 1328 #if defined(OS_MACOSX) | 1330 #if defined(OS_MACOSX) |
| 1329 ThemeHelperMac::GetInstance(); | 1331 ThemeHelperMac::GetInstance(); |
| 1330 SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys(); | 1332 SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys(); |
| 1331 #endif // defined(OS_MACOSX) | 1333 #endif // defined(OS_MACOSX) |
| 1332 | 1334 |
| 1335 #if defined(OS_ANDROID) |
| 1336 media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid()); |
| 1337 #endif |
| 1338 |
| 1333 return result_code_; | 1339 return result_code_; |
| 1334 } | 1340 } |
| 1335 | 1341 |
| 1336 bool BrowserMainLoop::UsingInProcessGpu() const { | 1342 bool BrowserMainLoop::UsingInProcessGpu() const { |
| 1337 return parsed_command_line_.HasSwitch(switches::kSingleProcess) || | 1343 return parsed_command_line_.HasSwitch(switches::kSingleProcess) || |
| 1338 parsed_command_line_.HasSwitch(switches::kInProcessGPU); | 1344 parsed_command_line_.HasSwitch(switches::kInProcessGPU); |
| 1339 } | 1345 } |
| 1340 | 1346 |
| 1341 bool BrowserMainLoop::InitializeToolkit() { | 1347 bool BrowserMainLoop::InitializeToolkit() { |
| 1342 TRACE_EVENT0("startup", "BrowserMainLoop::InitializeToolkit"); | 1348 TRACE_EVENT0("startup", "BrowserMainLoop::InitializeToolkit"); |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1504 std::move(worker_task_runner), | 1510 std::move(worker_task_runner), |
| 1505 MediaInternals::GetInstance()); | 1511 MediaInternals::GetInstance()); |
| 1506 } | 1512 } |
| 1507 CHECK(audio_manager_); | 1513 CHECK(audio_manager_); |
| 1508 | 1514 |
| 1509 if (use_hang_monitor) | 1515 if (use_hang_monitor) |
| 1510 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); | 1516 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); |
| 1511 } | 1517 } |
| 1512 | 1518 |
| 1513 } // namespace content | 1519 } // namespace content |
| OLD | NEW |