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

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

Issue 1262613005: Remove interface_impl.h and error_handler.h usage from chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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 | « device/serial/serial_service_unittest.cc ('k') | media/mojo/services/mojo_renderer_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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.h" 5 #include "media/mojo/services/mojo_cdm.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "media/base/cdm_context.h" 9 #include "media/base/cdm_context.h"
10 #include "media/base/cdm_key_information.h" 10 #include "media/base/cdm_key_information.h"
11 #include "media/base/cdm_promise.h" 11 #include "media/base/cdm_promise.h"
12 #include "media/mojo/services/media_type_converters.h" 12 #include "media/mojo/services/media_type_converters.h"
13 #include "mojo/application/public/cpp/connect.h" 13 #include "mojo/application/public/cpp/connect.h"
14 #include "mojo/application/public/interfaces/service_provider.mojom.h" 14 #include "mojo/application/public/interfaces/service_provider.mojom.h"
15 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
16 #include "url/gurl.h" 15 #include "url/gurl.h"
17 16
18 namespace media { 17 namespace media {
19 18
20 template <typename PromiseType> 19 template <typename PromiseType>
21 static void RejectPromise(scoped_ptr<PromiseType> promise, 20 static void RejectPromise(scoped_ptr<PromiseType> promise,
22 interfaces::CdmPromiseResultPtr result) { 21 interfaces::CdmPromiseResultPtr result) {
23 promise->reject(static_cast<MediaKeys::Exception>(result->exception), 22 promise->reject(static_cast<MediaKeys::Exception>(result->exception),
24 result->system_code, result->error_message); 23 result->system_code, result->error_message);
25 } 24 }
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 } 222 }
224 223
225 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id, 224 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
226 double new_expiry_time_sec) { 225 double new_expiry_time_sec) {
227 DVLOG(2) << __FUNCTION__; 226 DVLOG(2) << __FUNCTION__;
228 session_expiration_update_cb_.Run( 227 session_expiration_update_cb_.Run(
229 session_id, base::Time::FromDoubleT(new_expiry_time_sec)); 228 session_id, base::Time::FromDoubleT(new_expiry_time_sec));
230 } 229 }
231 230
232 } // namespace media 231 } // namespace media
OLDNEW
« no previous file with comments | « device/serial/serial_service_unittest.cc ('k') | media/mojo/services/mojo_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698