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

Side by Side Diff: content/renderer/media/android/proxy_media_keys.cc

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments, adding checks Created 6 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/android/proxy_media_keys.h" 5 #include "content/renderer/media/android/proxy_media_keys.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 manager_->ReleaseSession(cdm_id_, session_id); 87 manager_->ReleaseSession(cdm_id_, session_id);
88 } 88 }
89 89
90 void ProxyMediaKeys::OnSessionCreated(uint32 session_id, 90 void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
91 const std::string& web_session_id) { 91 const std::string& web_session_id) {
92 session_created_cb_.Run(session_id, web_session_id); 92 session_created_cb_.Run(session_id, web_session_id);
93 } 93 }
94 94
95 void ProxyMediaKeys::OnSessionMessage(uint32 session_id, 95 void ProxyMediaKeys::OnSessionMessage(uint32 session_id,
96 const std::vector<uint8>& message, 96 const std::vector<uint8>& message,
97 const std::string& destination_url) { 97 const GURL& destination_url) {
98 session_message_cb_.Run(session_id, message, destination_url); 98 session_message_cb_.Run(session_id, message, destination_url);
99 } 99 }
100 100
101 void ProxyMediaKeys::OnSessionReady(uint32 session_id) { 101 void ProxyMediaKeys::OnSessionReady(uint32 session_id) {
102 session_ready_cb_.Run(session_id); 102 session_ready_cb_.Run(session_id);
103 } 103 }
104 104
105 void ProxyMediaKeys::OnSessionClosed(uint32 session_id) { 105 void ProxyMediaKeys::OnSessionClosed(uint32 session_id) {
106 session_closed_cb_.Run(session_id); 106 session_closed_cb_.Run(session_id);
107 } 107 }
(...skipping 23 matching lines...) Expand all
131 session_closed_cb_(session_closed_cb), 131 session_closed_cb_(session_closed_cb),
132 session_error_cb_(session_error_cb) { 132 session_error_cb_(session_error_cb) {
133 } 133 }
134 134
135 void ProxyMediaKeys::InitializeCdm(const std::string& key_system, 135 void ProxyMediaKeys::InitializeCdm(const std::string& key_system,
136 const GURL& security_origin) { 136 const GURL& security_origin) {
137 manager_->InitializeCdm(cdm_id_, this, key_system, security_origin); 137 manager_->InitializeCdm(cdm_id_, this, key_system, security_origin);
138 } 138 }
139 139
140 } // namespace content 140 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698