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

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

Issue 846443006: Include Mojo SDK/EDK via fully-qualified paths in Chromium code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix include to satisfy checkdeps Created 5 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/mojo/DEPS ('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 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_key_information.h" 9 #include "media/base/cdm_key_information.h"
10 #include "media/base/cdm_promise.h" 10 #include "media/base/cdm_promise.h"
11 #include "media/mojo/services/media_type_converters.h" 11 #include "media/mojo/services/media_type_converters.h"
12 #include "mojo/public/cpp/application/connect.h" 12 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
13 #include "mojo/public/cpp/bindings/interface_impl.h" 13 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
14 #include "mojo/public/interfaces/application/service_provider.mojom.h" 14 #include "third_party/mojo/src/mojo/public/interfaces/application/service_provid er.mojom.h"
15 #include "url/gurl.h" 15 #include "url/gurl.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 static mojo::Array<uint8_t> CreateMojoArray(const uint8_t* data, int length) { 19 static mojo::Array<uint8_t> CreateMojoArray(const uint8_t* data, int length) {
20 DCHECK(data); 20 DCHECK(data);
21 DCHECK_GT(length, 0); 21 DCHECK_GT(length, 0);
22 std::vector<uint8_t> vector(data, data + length); 22 std::vector<uint8_t> vector(data, data + length);
23 mojo::Array<uint8_t> array; 23 mojo::Array<uint8_t> array;
24 array.Swap(&vector); 24 array.Swap(&vector);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 key_data.Pass()); 163 key_data.Pass());
164 } 164 }
165 165
166 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id, 166 void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
167 int64_t new_expiry_time_usec) { 167 int64_t new_expiry_time_usec) {
168 session_expiration_update_cb_.Run( 168 session_expiration_update_cb_.Run(
169 session_id, base::Time::FromInternalValue(new_expiry_time_usec)); 169 session_id, base::Time::FromInternalValue(new_expiry_time_usec));
170 } 170 }
171 171
172 } // namespace media 172 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/DEPS ('k') | media/mojo/services/mojo_cdm_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698