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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 GLibLogHandler, | 271 GLibLogHandler, |
272 NULL); | 272 NULL); |
273 } | 273 } |
274 } | 274 } |
275 #endif // defined(USE_GLIB) | 275 #endif // defined(USE_GLIB) |
276 | 276 |
277 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) | 277 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) |
278 void WaitForMojoShellInitialize() { | 278 void WaitForMojoShellInitialize() { |
279 // TODO(rockot): Remove this. http://crbug.com/594852. | 279 // TODO(rockot): Remove this. http://crbug.com/594852. |
280 base::RunLoop wait_loop; | 280 base::RunLoop wait_loop; |
281 MojoShellConnection::GetForProcess()->GetShellConnection()-> | 281 MojoShellConnection::GetForProcess()->SetInitializeHandler( |
282 set_initialize_handler(wait_loop.QuitClosure()); | 282 wait_loop.QuitClosure()); |
283 wait_loop.Run(); | 283 wait_loop.Run(); |
284 } | 284 } |
285 #endif // defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) | 285 #endif // defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) |
286 | 286 |
287 void OnStoppedStartupTracing(const base::FilePath& trace_file) { | 287 void OnStoppedStartupTracing(const base::FilePath& trace_file) { |
288 VLOG(0) << "Completed startup tracing to " << trace_file.value(); | 288 VLOG(0) << "Completed startup tracing to " << trace_file.value(); |
289 } | 289 } |
290 | 290 |
291 // Disable optimizations for this block of functions so the compiler doesn't | 291 // Disable optimizations for this block of functions so the compiler doesn't |
292 // merge them all together. This makes it possible to tell what thread was | 292 // merge them all together. This makes it possible to tell what thread was |
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1512 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1512 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
1513 audio_thread_->task_runner(); | 1513 audio_thread_->task_runner(); |
1514 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1514 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
1515 std::move(worker_task_runner), | 1515 std::move(worker_task_runner), |
1516 MediaInternals::GetInstance()); | 1516 MediaInternals::GetInstance()); |
1517 } | 1517 } |
1518 CHECK(audio_manager_); | 1518 CHECK(audio_manager_); |
1519 } | 1519 } |
1520 | 1520 |
1521 } // namespace content | 1521 } // namespace content |
OLD | NEW |