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

Side by Side Diff: media/remoting/remoting_cdm.cc

Issue 2643253003: Media Remoting Clean-up: Less-redundant naming, style consistency, etc. (Closed)
Patch Set: REBASE Created 3 years, 11 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/remoting/remoting_cdm.h ('k') | media/remoting/remoting_cdm_context.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 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 "media/remoting/remoting_cdm.h" 5 #include "media/remoting/remoting_cdm.h"
6 6
7 #include "media/base/cdm_promise.h" 7 #include "media/base/cdm_promise.h"
8 8
9 namespace media { 9 namespace media {
10 namespace remoting {
10 11
11 // TODO(xjz): Merge this with erickung's implementation. 12 // TODO(xjz): Merge this with erickung's implementation.
12 RemotingCdm::RemotingCdm( 13 RemotingCdm::RemotingCdm(
13 const std::string& key_system, 14 const std::string& key_system,
14 const GURL& security_origin, 15 const GURL& security_origin,
15 const CdmConfig& cdm_config, 16 const CdmConfig& cdm_config,
16 const SessionMessageCB& session_message_cb, 17 const SessionMessageCB& session_message_cb,
17 const SessionClosedCB& session_closed_cb, 18 const SessionClosedCB& session_closed_cb,
18 const SessionKeysChangeCB& session_keys_change_cb, 19 const SessionKeysChangeCB& session_keys_change_cb,
19 const SessionExpirationUpdateCB& session_expiration_update_cb, 20 const SessionExpirationUpdateCB& session_expiration_update_cb,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void RemotingCdm::RemoveSession(const std::string& session_id, 68 void RemotingCdm::RemoveSession(const std::string& session_id,
68 std::unique_ptr<SimpleCdmPromise> promise) { 69 std::unique_ptr<SimpleCdmPromise> promise) {
69 // TODO(xjz): Merge with erickung's implementation. 70 // TODO(xjz): Merge with erickung's implementation.
70 NOTIMPLEMENTED(); 71 NOTIMPLEMENTED();
71 } 72 }
72 73
73 CdmContext* RemotingCdm::GetCdmContext() { 74 CdmContext* RemotingCdm::GetCdmContext() {
74 return &remoting_cdm_context_; 75 return &remoting_cdm_context_;
75 } 76 }
76 77
77 RemotingSourceImpl* RemotingCdm::GetRemotingSource() { 78 } // namespace remoting
78 return remoting_cdm_controller_->remoting_source();
79 }
80
81 } // namespace media 79 } // namespace media
OLDNEW
« no previous file with comments | « media/remoting/remoting_cdm.h ('k') | media/remoting/remoting_cdm_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698