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

Side by Side Diff: content/renderer/media/media_interface_provider.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
OLDNEW
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/renderer/media/media_interface_provider.h" 5 #include "content/renderer/media/media_interface_provider.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 10 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
11 #include "media/mojo/interfaces/renderer.mojom.h" 11 #include "media/mojo/interfaces/renderer.mojom.h"
12 #include "mojo/public/cpp/bindings/interface_request.h" 12 #include "mojo/public/cpp/bindings/interface_request.h"
13 #include "services/shell/public/cpp/interface_provider.h" 13 #include "services/service_manager/public/cpp/interface_provider.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 MediaInterfaceProvider::MediaInterfaceProvider( 17 MediaInterfaceProvider::MediaInterfaceProvider(
18 shell::InterfaceProvider* remote_interfaces) 18 shell::InterfaceProvider* remote_interfaces)
19 : remote_interfaces_(remote_interfaces) { 19 : remote_interfaces_(remote_interfaces) {
20 } 20 }
21 21
22 MediaInterfaceProvider::~MediaInterfaceProvider() { 22 MediaInterfaceProvider::~MediaInterfaceProvider() {
23 DCHECK(thread_checker_.CalledOnValidThread()); 23 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 void MediaInterfaceProvider::OnConnectionError() { 63 void MediaInterfaceProvider::OnConnectionError() {
64 DVLOG(1) << __FUNCTION__; 64 DVLOG(1) << __FUNCTION__;
65 DCHECK(thread_checker_.CalledOnValidThread()); 65 DCHECK(thread_checker_.CalledOnValidThread());
66 66
67 media_service_factory_.reset(); 67 media_service_factory_.reset();
68 } 68 }
69 69
70 } // namespace content 70 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_interface_provider.h ('k') | content/renderer/media/user_media_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698