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

Side by Side Diff: media/mojo/services/mojo_cdm_factory.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_promise.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/services/mojo_cdm_factory.h" 5 #include "media/mojo/services/mojo_cdm_factory.h"
6 6
7 #include "media/mojo/interfaces/service_factory.mojom.h" 7 #include "media/mojo/interfaces/service_factory.mojom.h"
8 #include "media/mojo/services/mojo_cdm.h" 8 #include "media/mojo/services/mojo_cdm.h"
9 #include "mojo/application/public/cpp/connect.h" 9 #include "mojo/application/public/cpp/connect.h"
10 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" 10 #include "mojo/public/cpp/bindings/interface_request.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 MojoCdmFactory::MojoCdmFactory(interfaces::ServiceFactory* service_factory) 14 MojoCdmFactory::MojoCdmFactory(interfaces::ServiceFactory* service_factory)
15 : service_factory_(service_factory) { 15 : service_factory_(service_factory) {
16 DCHECK(service_factory_); 16 DCHECK(service_factory_);
17 } 17 }
18 18
19 MojoCdmFactory::~MojoCdmFactory() { 19 MojoCdmFactory::~MojoCdmFactory() {
20 } 20 }
(...skipping 14 matching lines...) Expand all
35 interfaces::ContentDecryptionModulePtr cdm_ptr; 35 interfaces::ContentDecryptionModulePtr cdm_ptr;
36 service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr)); 36 service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr));
37 37
38 MojoCdm::Create(key_system, security_origin, cdm_config, cdm_ptr.Pass(), 38 MojoCdm::Create(key_system, security_origin, cdm_config, cdm_ptr.Pass(),
39 session_message_cb, session_closed_cb, 39 session_message_cb, session_closed_cb,
40 legacy_session_error_cb, session_keys_change_cb, 40 legacy_session_error_cb, session_keys_change_cb,
41 session_expiration_update_cb, cdm_created_cb); 41 session_expiration_update_cb, cdm_created_cb);
42 } 42 }
43 43
44 } // namespace media 44 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698