| 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(new media::KeyPressMonitor()); |
| 420 } |
| 421 { |
| 417 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") | 422 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") |
| 418 midi_manager_.reset(media::MIDIManager::Create()); | 423 midi_manager_.reset(media::MIDIManager::Create()); |
| 419 } | 424 } |
| 420 | 425 |
| 421 #if !defined(OS_IOS) | 426 #if !defined(OS_IOS) |
| 422 { | 427 { |
| 423 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") | 428 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") |
| 424 WebUIControllerFactory::RegisterFactory( | 429 WebUIControllerFactory::RegisterFactory( |
| 425 ContentWebUIControllerFactory::GetInstance()); | 430 ContentWebUIControllerFactory::GetInstance()); |
| 426 } | 431 } |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 if (parameters_.ui_task) | 906 if (parameters_.ui_task) |
| 902 base::MessageLoopForUI::current()->PostTask(FROM_HERE, | 907 base::MessageLoopForUI::current()->PostTask(FROM_HERE, |
| 903 *parameters_.ui_task); | 908 *parameters_.ui_task); |
| 904 | 909 |
| 905 base::RunLoop run_loop; | 910 base::RunLoop run_loop; |
| 906 run_loop.Run(); | 911 run_loop.Run(); |
| 907 #endif | 912 #endif |
| 908 } | 913 } |
| 909 | 914 |
| 910 } // namespace content | 915 } // namespace content |
| OLD | NEW |