OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/media/media_interface_proxy.h" | 5 #include "content/browser/media/media_interface_proxy.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "content/public/browser/content_browser_client.h" | 11 #include "content/public/browser/content_browser_client.h" |
11 #include "content/public/browser/render_frame_host.h" | 12 #include "content/public/browser/render_frame_host.h" |
12 #include "content/public/common/content_client.h" | 13 #include "content/public/common/content_client.h" |
13 #include "content/public/common/service_manager_connection.h" | 14 #include "content/public/common/service_manager_connection.h" |
14 #include "media/mojo/interfaces/media_service.mojom.h" | 15 #include "media/mojo/interfaces/media_service.mojom.h" |
15 #include "services/service_manager/public/cpp/connector.h" | 16 #include "services/service_manager/public/cpp/connector.h" |
16 | 17 |
17 #if defined(ENABLE_MOJO_CDM) | 18 #if defined(ENABLE_MOJO_CDM) |
18 #include "content/public/browser/browser_context.h" | 19 #include "content/public/browser/browser_context.h" |
19 #include "content/public/browser/provision_fetcher_impl.h" | 20 #include "content/public/browser/provision_fetcher_impl.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 service_manager::Connector* connector = | 127 service_manager::Connector* connector = |
127 ServiceManagerConnection::GetForProcess()->GetConnector(); | 128 ServiceManagerConnection::GetForProcess()->GetConnector(); |
128 connector->ConnectToInterface("media", &media_service); | 129 connector->ConnectToInterface("media", &media_service); |
129 media_service->CreateInterfaceFactory(MakeRequest(&interface_factory_ptr_), | 130 media_service->CreateInterfaceFactory(MakeRequest(&interface_factory_ptr_), |
130 std::move(interfaces)); | 131 std::move(interfaces)); |
131 interface_factory_ptr_.set_connection_error_handler(base::Bind( | 132 interface_factory_ptr_.set_connection_error_handler(base::Bind( |
132 &MediaInterfaceProxy::OnConnectionError, base::Unretained(this))); | 133 &MediaInterfaceProxy::OnConnectionError, base::Unretained(this))); |
133 } | 134 } |
134 | 135 |
135 } // namespace content | 136 } // namespace content |
OLD | NEW |