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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 #include "content/public/browser/browser_main_parts.h" | 40 #include "content/public/browser/browser_main_parts.h" |
41 #include "content/public/browser/browser_shutdown.h" | 41 #include "content/public/browser/browser_shutdown.h" |
42 #include "content/public/browser/compositor_util.h" | 42 #include "content/public/browser/compositor_util.h" |
43 #include "content/public/browser/content_browser_client.h" | 43 #include "content/public/browser/content_browser_client.h" |
44 #include "content/public/browser/render_process_host.h" | 44 #include "content/public/browser/render_process_host.h" |
45 #include "content/public/common/content_switches.h" | 45 #include "content/public/common/content_switches.h" |
46 #include "content/public/common/main_function_params.h" | 46 #include "content/public/common/main_function_params.h" |
47 #include "content/public/common/result_codes.h" | 47 #include "content/public/common/result_codes.h" |
48 #include "crypto/nss_util.h" | 48 #include "crypto/nss_util.h" |
49 #include "media/audio/audio_manager.h" | 49 #include "media/audio/audio_manager.h" |
| 50 #include "media/audio/key_press_monitor.h" |
50 #include "media/base/media.h" | 51 #include "media/base/media.h" |
51 #include "media/midi/midi_manager.h" | 52 #include "media/midi/midi_manager.h" |
52 #include "net/base/network_change_notifier.h" | 53 #include "net/base/network_change_notifier.h" |
53 #include "net/socket/client_socket_factory.h" | 54 #include "net/socket/client_socket_factory.h" |
54 #include "net/ssl/ssl_config_service.h" | 55 #include "net/ssl/ssl_config_service.h" |
55 #include "ui/base/clipboard/clipboard.h" | 56 #include "ui/base/clipboard/clipboard.h" |
56 | 57 |
57 #if defined(USE_AURA) | 58 #if defined(USE_AURA) |
58 #include "content/browser/aura/image_transport_factory.h" | 59 #include "content/browser/aura/image_transport_factory.h" |
59 #endif | 60 #endif |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 | 408 |
408 { | 409 { |
409 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") | 410 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") |
410 media::InitializeCPUSpecificMediaFeatures(); | 411 media::InitializeCPUSpecificMediaFeatures(); |
411 } | 412 } |
412 { | 413 { |
413 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") | 414 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") |
414 audio_manager_.reset(media::AudioManager::Create()); | 415 audio_manager_.reset(media::AudioManager::Create()); |
415 } | 416 } |
416 { | 417 { |
| 418 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:KeyPressMonitor") |
| 419 key_press_monitor_.reset( |
| 420 new media::KeyPressMonitor(audio_manager_->GetMessageLoop())); |
| 421 } |
| 422 { |
417 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") | 423 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") |
418 midi_manager_.reset(media::MIDIManager::Create()); | 424 midi_manager_.reset(media::MIDIManager::Create()); |
419 } | 425 } |
420 | 426 |
421 #if !defined(OS_IOS) | 427 #if !defined(OS_IOS) |
422 { | 428 { |
423 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") | 429 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") |
424 WebUIControllerFactory::RegisterFactory( | 430 WebUIControllerFactory::RegisterFactory( |
425 ContentWebUIControllerFactory::GetInstance()); | 431 ContentWebUIControllerFactory::GetInstance()); |
426 } | 432 } |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 if (parameters_.ui_task) | 907 if (parameters_.ui_task) |
902 base::MessageLoopForUI::current()->PostTask(FROM_HERE, | 908 base::MessageLoopForUI::current()->PostTask(FROM_HERE, |
903 *parameters_.ui_task); | 909 *parameters_.ui_task); |
904 | 910 |
905 base::RunLoop run_loop; | 911 base::RunLoop run_loop; |
906 run_loop.Run(); | 912 run_loop.Run(); |
907 #endif | 913 #endif |
908 } | 914 } |
909 | 915 |
910 } // namespace content | 916 } // namespace content |
OLD | NEW |