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

Side by Side Diff: media/mojo/clients/mojo_cdm_factory.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
« no previous file with comments | « media/mojo/clients/mojo_cdm.cc ('k') | media/mojo/clients/mojo_decoder_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "media/mojo/clients/mojo_cdm_factory.h" 5 #include "media/mojo/clients/mojo_cdm_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "media/base/key_systems.h" 11 #include "media/base/key_systems.h"
12 #include "media/cdm/aes_decryptor.h" 12 #include "media/cdm/aes_decryptor.h"
13 #include "media/mojo/clients/mojo_cdm.h" 13 #include "media/mojo/clients/mojo_cdm.h"
14 #include "services/shell/public/cpp/connect.h" 14 #include "services/service_manager/public/cpp/connect.h"
15 #include "services/shell/public/interfaces/interface_provider.mojom.h" 15 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 MojoCdmFactory::MojoCdmFactory( 19 MojoCdmFactory::MojoCdmFactory(
20 shell::mojom::InterfaceProvider* interface_provider) 20 shell::mojom::InterfaceProvider* interface_provider)
21 : interface_provider_(interface_provider) { 21 : interface_provider_(interface_provider) {
22 DCHECK(interface_provider_); 22 DCHECK(interface_provider_);
23 } 23 }
24 24
25 MojoCdmFactory::~MojoCdmFactory() {} 25 MojoCdmFactory::~MojoCdmFactory() {}
(...skipping 27 matching lines...) Expand all
53 mojom::ContentDecryptionModulePtr cdm_ptr; 53 mojom::ContentDecryptionModulePtr cdm_ptr;
54 shell::GetInterface<mojom::ContentDecryptionModule>(interface_provider_, 54 shell::GetInterface<mojom::ContentDecryptionModule>(interface_provider_,
55 &cdm_ptr); 55 &cdm_ptr);
56 56
57 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr), 57 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr),
58 session_message_cb, session_closed_cb, session_keys_change_cb, 58 session_message_cb, session_closed_cb, session_keys_change_cb,
59 session_expiration_update_cb, cdm_created_cb); 59 session_expiration_update_cb, cdm_created_cb);
60 } 60 }
61 61
62 } // namespace media 62 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/clients/mojo_cdm.cc ('k') | media/mojo/clients/mojo_decoder_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698