| 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/hi_res_timer_manager.h" | 10 #include "base/hi_res_timer_manager.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "content/public/browser/browser_shutdown.h" | 40 #include "content/public/browser/browser_shutdown.h" |
| 41 #include "content/public/browser/compositor_util.h" | 41 #include "content/public/browser/compositor_util.h" |
| 42 #include "content/public/browser/content_browser_client.h" | 42 #include "content/public/browser/content_browser_client.h" |
| 43 #include "content/public/browser/render_process_host.h" | 43 #include "content/public/browser/render_process_host.h" |
| 44 #include "content/public/common/content_switches.h" | 44 #include "content/public/common/content_switches.h" |
| 45 #include "content/public/common/main_function_params.h" | 45 #include "content/public/common/main_function_params.h" |
| 46 #include "content/public/common/result_codes.h" | 46 #include "content/public/common/result_codes.h" |
| 47 #include "crypto/nss_util.h" | 47 #include "crypto/nss_util.h" |
| 48 #include "media/audio/audio_manager.h" | 48 #include "media/audio/audio_manager.h" |
| 49 #include "media/base/media.h" | 49 #include "media/base/media.h" |
| 50 #include "media/midi/midi_manager.h" | |
| 51 #include "net/base/network_change_notifier.h" | 50 #include "net/base/network_change_notifier.h" |
| 52 #include "net/socket/client_socket_factory.h" | 51 #include "net/socket/client_socket_factory.h" |
| 53 #include "net/ssl/ssl_config_service.h" | 52 #include "net/ssl/ssl_config_service.h" |
| 54 #include "ui/base/clipboard/clipboard.h" | 53 #include "ui/base/clipboard/clipboard.h" |
| 55 | 54 |
| 56 #if defined(USE_AURA) | 55 #if defined(USE_AURA) |
| 57 #include "content/browser/renderer_host/image_transport_factory.h" | 56 #include "content/browser/renderer_host/image_transport_factory.h" |
| 58 #endif | 57 #endif |
| 59 | 58 |
| 60 #if defined(OS_ANDROID) | 59 #if defined(OS_ANDROID) |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 } | 393 } |
| 395 | 394 |
| 396 { | 395 { |
| 397 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") | 396 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") |
| 398 media::InitializeCPUSpecificMediaFeatures(); | 397 media::InitializeCPUSpecificMediaFeatures(); |
| 399 } | 398 } |
| 400 { | 399 { |
| 401 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") | 400 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") |
| 402 audio_manager_.reset(media::AudioManager::Create()); | 401 audio_manager_.reset(media::AudioManager::Create()); |
| 403 } | 402 } |
| 404 { | 403 |
| 405 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") | |
| 406 midi_manager_.reset(media::MIDIManager::Create()); | |
| 407 } | |
| 408 | 404 |
| 409 #if !defined(OS_IOS) | 405 #if !defined(OS_IOS) |
| 410 { | 406 { |
| 411 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") | 407 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") |
| 412 WebUIControllerFactory::RegisterFactory( | 408 WebUIControllerFactory::RegisterFactory( |
| 413 ContentWebUIControllerFactory::GetInstance()); | 409 ContentWebUIControllerFactory::GetInstance()); |
| 414 } | 410 } |
| 415 | 411 |
| 416 { | 412 { |
| 417 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") | 413 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 if (parameters_.ui_task) | 909 if (parameters_.ui_task) |
| 914 base::MessageLoopForUI::current()->PostTask(FROM_HERE, | 910 base::MessageLoopForUI::current()->PostTask(FROM_HERE, |
| 915 *parameters_.ui_task); | 911 *parameters_.ui_task); |
| 916 | 912 |
| 917 base::RunLoop run_loop; | 913 base::RunLoop run_loop; |
| 918 run_loop.Run(); | 914 run_loop.Run(); |
| 919 #endif | 915 #endif |
| 920 } | 916 } |
| 921 | 917 |
| 922 } // namespace content | 918 } // namespace content |
| OLD | NEW |