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

Side by Side Diff: media/mojo/clients/mojo_cdm_factory.h

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . 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 | « mash/webtest/webtest.cc ('k') | media/mojo/clients/mojo_cdm_factory.cc » ('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 #ifndef MEDIA_MOJO_CLIENTS_MOJO_CDM_FACTORY_H_ 5 #ifndef MEDIA_MOJO_CLIENTS_MOJO_CDM_FACTORY_H_
6 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_FACTORY_H_ 6 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_FACTORY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "media/base/cdm_factory.h" 9 #include "media/base/cdm_factory.h"
10 10
11 namespace shell { 11 namespace service_manager {
12 namespace mojom { 12 namespace mojom {
13 class InterfaceProvider; 13 class InterfaceProvider;
14 } 14 }
15 } 15 }
16 16
17 namespace media { 17 namespace media {
18 18
19 class MojoCdmFactory : public CdmFactory { 19 class MojoCdmFactory : public CdmFactory {
20 public: 20 public:
21 explicit MojoCdmFactory(shell::mojom::InterfaceProvider* interface_provider); 21 explicit MojoCdmFactory(
22 service_manager::mojom::InterfaceProvider* interface_provider);
22 ~MojoCdmFactory() final; 23 ~MojoCdmFactory() final;
23 24
24 // CdmFactory implementation. 25 // CdmFactory implementation.
25 void Create(const std::string& key_system, 26 void Create(const std::string& key_system,
26 const GURL& security_origin, 27 const GURL& security_origin,
27 const CdmConfig& cdm_config, 28 const CdmConfig& cdm_config,
28 const SessionMessageCB& session_message_cb, 29 const SessionMessageCB& session_message_cb,
29 const SessionClosedCB& session_closed_cb, 30 const SessionClosedCB& session_closed_cb,
30 const SessionKeysChangeCB& session_keys_change_cb, 31 const SessionKeysChangeCB& session_keys_change_cb,
31 const SessionExpirationUpdateCB& session_expiration_update_cb, 32 const SessionExpirationUpdateCB& session_expiration_update_cb,
32 const CdmCreatedCB& cdm_created_cb) final; 33 const CdmCreatedCB& cdm_created_cb) final;
33 34
34 private: 35 private:
35 shell::mojom::InterfaceProvider* interface_provider_; 36 service_manager::mojom::InterfaceProvider* interface_provider_;
36 37
37 DISALLOW_COPY_AND_ASSIGN(MojoCdmFactory); 38 DISALLOW_COPY_AND_ASSIGN(MojoCdmFactory);
38 }; 39 };
39 40
40 } // namespace media 41 } // namespace media
41 42
42 #endif // MEDIA_MOJO_CLIENTS_MOJO_CDM_FACTORY_H_ 43 #endif // MEDIA_MOJO_CLIENTS_MOJO_CDM_FACTORY_H_
OLDNEW
« no previous file with comments | « mash/webtest/webtest.cc ('k') | media/mojo/clients/mojo_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698