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 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" | 110 #include "content/browser/screen_orientation/screen_orientation_delegate_android
.h" |
111 #include "content/public/browser/screen_orientation_provider.h" | 111 #include "content/public/browser/screen_orientation_provider.h" |
112 #include "ui/gl/gl_surface.h" | 112 #include "ui/gl/gl_surface.h" |
113 #endif | 113 #endif |
114 | 114 |
115 #if defined(OS_MACOSX) && !defined(OS_IOS) | 115 #if defined(OS_MACOSX) && !defined(OS_IOS) |
116 #include "base/memory/memory_pressure_monitor_mac.h" | 116 #include "base/memory/memory_pressure_monitor_mac.h" |
117 #include "content/browser/bootstrap_sandbox_manager_mac.h" | 117 #include "content/browser/bootstrap_sandbox_manager_mac.h" |
118 #include "content/browser/cocoa/system_hotkey_helper_mac.h" | 118 #include "content/browser/cocoa/system_hotkey_helper_mac.h" |
119 #include "content/browser/compositor/browser_compositor_view_mac.h" | 119 #include "content/browser/compositor/browser_compositor_view_mac.h" |
| 120 #include "content/browser/mach_broker_mac.h" |
120 #include "content/browser/theme_helper_mac.h" | 121 #include "content/browser/theme_helper_mac.h" |
121 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" | 122 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" |
122 #endif | 123 #endif |
123 | 124 |
124 #if defined(USE_OZONE) | 125 #if defined(USE_OZONE) |
125 #include "ui/ozone/public/client_native_pixmap_factory.h" | 126 #include "ui/ozone/public/client_native_pixmap_factory.h" |
126 #include "ui/ozone/public/ozone_platform.h" | 127 #include "ui/ozone/public/ozone_platform.h" |
127 #endif | 128 #endif |
128 | 129 |
129 #if defined(OS_WIN) | 130 #if defined(OS_WIN) |
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1191 | 1192 |
1192 int BrowserMainLoop::BrowserThreadsStarted() { | 1193 int BrowserMainLoop::BrowserThreadsStarted() { |
1193 TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted"); | 1194 TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted"); |
1194 | 1195 |
1195 #if !defined(OS_IOS) | 1196 #if !defined(OS_IOS) |
1196 // Bring up Mojo IPC and shell as early as possible. | 1197 // Bring up Mojo IPC and shell as early as possible. |
1197 mojo_ipc_support_.reset(new IPC::ScopedIPCSupport( | 1198 mojo_ipc_support_.reset(new IPC::ScopedIPCSupport( |
1198 BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO) | 1199 BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO) |
1199 ->task_runner())); | 1200 ->task_runner())); |
1200 mojo_shell_context_.reset(new MojoShellContext); | 1201 mojo_shell_context_.reset(new MojoShellContext); |
1201 #endif | 1202 #if defined(OS_MACOSX) |
| 1203 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); |
| 1204 #endif // defined(OS_MACOSX) |
| 1205 #endif // !defined(OS_IOS) |
1202 | 1206 |
1203 #if !defined(OS_IOS) | 1207 #if !defined(OS_IOS) |
1204 indexed_db_thread_.reset(new base::Thread("IndexedDB")); | 1208 indexed_db_thread_.reset(new base::Thread("IndexedDB")); |
1205 indexed_db_thread_->Start(); | 1209 indexed_db_thread_->Start(); |
1206 #endif | 1210 #endif |
1207 | 1211 |
1208 #if !defined(OS_IOS) | 1212 #if !defined(OS_IOS) |
1209 HistogramSynchronizer::GetInstance(); | 1213 HistogramSynchronizer::GetInstance(); |
1210 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | 1214 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
1211 // Up the priority of the UI thread. | 1215 // Up the priority of the UI thread. |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1477 DCHECK(is_tracing_startup_for_duration_); | 1481 DCHECK(is_tracing_startup_for_duration_); |
1478 | 1482 |
1479 is_tracing_startup_for_duration_ = false; | 1483 is_tracing_startup_for_duration_ = false; |
1480 TracingController::GetInstance()->StopTracing( | 1484 TracingController::GetInstance()->StopTracing( |
1481 TracingController::CreateFileSink( | 1485 TracingController::CreateFileSink( |
1482 startup_trace_file_, | 1486 startup_trace_file_, |
1483 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1487 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1484 } | 1488 } |
1485 | 1489 |
1486 } // namespace content | 1490 } // namespace content |
OLD | NEW |