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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 #include "content/browser/renderer_host/render_process_host_impl.h" | 61 #include "content/browser/renderer_host/render_process_host_impl.h" |
62 #include "content/browser/service_manager/service_manager_context.h" | 62 #include "content/browser/service_manager/service_manager_context.h" |
63 #include "content/browser/speech/speech_recognition_manager_impl.h" | 63 #include "content/browser/speech/speech_recognition_manager_impl.h" |
64 #include "content/browser/startup_task_runner.h" | 64 #include "content/browser/startup_task_runner.h" |
65 #include "content/browser/utility_process_host_impl.h" | 65 #include "content/browser/utility_process_host_impl.h" |
66 #include "content/browser/webui/content_web_ui_controller_factory.h" | 66 #include "content/browser/webui/content_web_ui_controller_factory.h" |
67 #include "content/browser/webui/url_data_manager.h" | 67 #include "content/browser/webui/url_data_manager.h" |
68 #include "content/common/content_switches_internal.h" | 68 #include "content/common/content_switches_internal.h" |
69 #include "content/common/host_discardable_shared_memory_manager.h" | 69 #include "content/common/host_discardable_shared_memory_manager.h" |
70 #include "content/common/host_shared_bitmap_manager.h" | 70 #include "content/common/host_shared_bitmap_manager.h" |
71 #include "content/common/mojo/mojo_shell_connection_impl.h" | 71 #include "content/common/service_manager/service_manager_connection_impl.h" |
72 #include "content/public/browser/browser_main_parts.h" | 72 #include "content/public/browser/browser_main_parts.h" |
73 #include "content/public/browser/content_browser_client.h" | 73 #include "content/public/browser/content_browser_client.h" |
74 #include "content/public/browser/gpu_data_manager_observer.h" | 74 #include "content/public/browser/gpu_data_manager_observer.h" |
75 #include "content/public/browser/render_process_host.h" | 75 #include "content/public/browser/render_process_host.h" |
76 #include "content/public/browser/tracing_controller.h" | 76 #include "content/public/browser/tracing_controller.h" |
77 #include "content/public/common/content_client.h" | 77 #include "content/public/common/content_client.h" |
78 #include "content/public/common/content_switches.h" | 78 #include "content/public/common/content_switches.h" |
79 #include "content/public/common/main_function_params.h" | 79 #include "content/public/common/main_function_params.h" |
80 #include "content/public/common/result_codes.h" | 80 #include "content/public/common/result_codes.h" |
81 #include "device/battery/battery_status_service.h" | 81 #include "device/battery/battery_status_service.h" |
(...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1468 } | 1468 } |
1469 | 1469 |
1470 mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport( | 1470 mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport( |
1471 BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO) | 1471 BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO) |
1472 ->task_runner())); | 1472 ->task_runner())); |
1473 | 1473 |
1474 service_manager_context_.reset(new ServiceManagerContext); | 1474 service_manager_context_.reset(new ServiceManagerContext); |
1475 #if defined(OS_MACOSX) | 1475 #if defined(OS_MACOSX) |
1476 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); | 1476 mojo::edk::SetMachPortProvider(MachBroker::GetInstance()); |
1477 #endif // defined(OS_MACOSX) | 1477 #endif // defined(OS_MACOSX) |
1478 if (parts_) | 1478 if (parts_) { |
1479 parts_->MojoShellConnectionStarted(MojoShellConnection::GetForProcess()); | 1479 parts_->ServiceManagerConnectionStarted( |
| 1480 ServiceManagerConnection::GetForProcess()); |
| 1481 } |
1480 } | 1482 } |
1481 | 1483 |
1482 base::FilePath BrowserMainLoop::GetStartupTraceFileName( | 1484 base::FilePath BrowserMainLoop::GetStartupTraceFileName( |
1483 const base::CommandLine& command_line) const { | 1485 const base::CommandLine& command_line) const { |
1484 base::FilePath trace_file; | 1486 base::FilePath trace_file; |
1485 if (command_line.HasSwitch(switches::kTraceStartup)) { | 1487 if (command_line.HasSwitch(switches::kTraceStartup)) { |
1486 trace_file = command_line.GetSwitchValuePath( | 1488 trace_file = command_line.GetSwitchValuePath( |
1487 switches::kTraceStartupFile); | 1489 switches::kTraceStartupFile); |
1488 // trace_file = "none" means that startup events will show up for the next | 1490 // trace_file = "none" means that startup events will show up for the next |
1489 // begin/end tracing (via about:tracing or AutomationProxy::BeginTracing/ | 1491 // begin/end tracing (via about:tracing or AutomationProxy::BeginTracing/ |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1569 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1571 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
1570 audio_thread_->task_runner(); | 1572 audio_thread_->task_runner(); |
1571 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1573 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
1572 std::move(worker_task_runner), | 1574 std::move(worker_task_runner), |
1573 MediaInternals::GetInstance()); | 1575 MediaInternals::GetInstance()); |
1574 } | 1576 } |
1575 CHECK(audio_manager_); | 1577 CHECK(audio_manager_); |
1576 } | 1578 } |
1577 | 1579 |
1578 } // namespace content | 1580 } // namespace content |
OLD | NEW |