Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 16025005: Web MIDI API back-end (work-in-progress) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For now disable sending data - fix IPC thread in renderer Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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"
50 #include "net/base/network_change_notifier.h" 51 #include "net/base/network_change_notifier.h"
51 #include "net/socket/client_socket_factory.h" 52 #include "net/socket/client_socket_factory.h"
52 #include "net/ssl/ssl_config_service.h" 53 #include "net/ssl/ssl_config_service.h"
53 #include "ui/base/clipboard/clipboard.h" 54 #include "ui/base/clipboard/clipboard.h"
54 55
55 #if defined(USE_AURA) 56 #if defined(USE_AURA)
56 #include "content/browser/renderer_host/image_transport_factory.h" 57 #include "content/browser/renderer_host/image_transport_factory.h"
57 #endif 58 #endif
58 59
59 #if defined(OS_ANDROID) 60 #if defined(OS_ANDROID)
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 } 394 }
394 395
395 { 396 {
396 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") 397 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
397 media::InitializeCPUSpecificMediaFeatures(); 398 media::InitializeCPUSpecificMediaFeatures();
398 } 399 }
399 { 400 {
400 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") 401 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
401 audio_manager_.reset(media::AudioManager::Create()); 402 audio_manager_.reset(media::AudioManager::Create());
402 } 403 }
403 404 {
405 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager")
406 midi_manager_.reset(media::MIDIManager::Create());
407 }
404 408
405 #if !defined(OS_IOS) 409 #if !defined(OS_IOS)
406 { 410 {
407 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") 411 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
408 WebUIControllerFactory::RegisterFactory( 412 WebUIControllerFactory::RegisterFactory(
409 ContentWebUIControllerFactory::GetInstance()); 413 ContentWebUIControllerFactory::GetInstance());
410 } 414 }
411 415
412 { 416 {
413 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") 417 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager")
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 if (parameters_.ui_task) 913 if (parameters_.ui_task)
910 base::MessageLoopForUI::current()->PostTask(FROM_HERE, 914 base::MessageLoopForUI::current()->PostTask(FROM_HERE,
911 *parameters_.ui_task); 915 *parameters_.ui_task);
912 916
913 base::RunLoop run_loop; 917 base::RunLoop run_loop;
914 run_loop.Run(); 918 run_loop.Run();
915 #endif 919 #endif
916 } 920 }
917 921
918 } // namespace content 922 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698