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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1209 } | 1209 } |
1210 } | 1210 } |
1211 mojo_shell_context_.reset(new MojoShellContext); | 1211 mojo_shell_context_.reset(new MojoShellContext); |
1212 if (IsRunningInMojoShell()) { | 1212 if (IsRunningInMojoShell()) { |
1213 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) | 1213 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) |
1214 MojoShellConnection* mojo_shell_connection = MojoShellConnection::Get(); | 1214 MojoShellConnection* mojo_shell_connection = MojoShellConnection::Get(); |
1215 if (mojo_shell_connection) { | 1215 if (mojo_shell_connection) { |
1216 // TODO(rockot): Remove the blocking wait for init. | 1216 // TODO(rockot): Remove the blocking wait for init. |
1217 // http://crbug.com/594852. | 1217 // http://crbug.com/594852. |
1218 WaitForMojoShellInitialize(); | 1218 WaitForMojoShellInitialize(); |
1219 views::WindowManagerConnection::Create( | 1219 window_manager_connection_ = views::WindowManagerConnection::Create( |
1220 mojo_shell_connection->GetConnector(), | 1220 mojo_shell_connection->GetConnector(), |
1221 mojo_shell_connection->GetIdentity()); | 1221 mojo_shell_connection->GetIdentity()); |
1222 } | 1222 } |
1223 #endif | 1223 #endif |
1224 } | 1224 } |
1225 | 1225 |
1226 #if defined(OS_MACOSX) | 1226 #if defined(OS_MACOSX) |
1227 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); | 1227 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); |
1228 #endif // defined(OS_MACOSX) | 1228 #endif // defined(OS_MACOSX) |
1229 | 1229 |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1546 std::move(worker_task_runner), | 1546 std::move(worker_task_runner), |
1547 MediaInternals::GetInstance()); | 1547 MediaInternals::GetInstance()); |
1548 } | 1548 } |
1549 CHECK(audio_manager_); | 1549 CHECK(audio_manager_); |
1550 | 1550 |
1551 if (use_hang_monitor) | 1551 if (use_hang_monitor) |
1552 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); | 1552 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); |
1553 } | 1553 } |
1554 | 1554 |
1555 } // namespace content | 1555 } // namespace content |
OLD | NEW |