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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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/services/mojo_cdm.h ('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 <stddef.h>
8
7 #include <utility> 9 #include <utility>
8 10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
11 #include "media/base/cdm_context.h" 13 #include "media/base/cdm_context.h"
12 #include "media/base/cdm_key_information.h" 14 #include "media/base/cdm_key_information.h"
13 #include "media/base/cdm_promise.h" 15 #include "media/base/cdm_promise.h"
14 #include "media/mojo/interfaces/decryptor.mojom.h" 16 #include "media/mojo/interfaces/decryptor.mojom.h"
15 #include "media/mojo/services/media_type_converters.h" 17 #include "media/mojo/services/media_type_converters.h"
16 #include "media/mojo/services/mojo_decryptor.h" 18 #include "media/mojo/services/mojo_decryptor.h"
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 return; 249 return;
248 } 250 }
249 251
250 DCHECK_NE(CdmContext::kInvalidCdmId, cdm_id); 252 DCHECK_NE(CdmContext::kInvalidCdmId, cdm_id);
251 cdm_id_ = cdm_id; 253 cdm_id_ = cdm_id;
252 decryptor_ptr_ = std::move(decryptor); 254 decryptor_ptr_ = std::move(decryptor);
253 promise->resolve(); 255 promise->resolve();
254 } 256 }
255 257
256 } // namespace media 258 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698