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

Side by Side Diff: media/mojo/services/mojo_cdm_promise.h

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 4 years, 12 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/services/mojo_cdm.cc ('k') | media/mojo/services/mojo_cdm_service.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 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
7 7
8 #include <stdint.h>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "media/base/cdm_promise.h" 11 #include "media/base/cdm_promise.h"
10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 12 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
11 #include "media/mojo/services/mojo_type_trait.h" 13 #include "media/mojo/services/mojo_type_trait.h"
12 #include "mojo/public/cpp/bindings/callback.h" 14 #include "mojo/public/cpp/bindings/callback.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 // media::CdmPromiseTemplate implementations backed by mojo::Callbacks. 18 // media::CdmPromiseTemplate implementations backed by mojo::Callbacks.
17 template <typename... T> 19 template <typename... T>
(...skipping 14 matching lines...) Expand all
32 34
33 private: 35 private:
34 using media::CdmPromiseTemplate<T...>::MarkPromiseSettled; 36 using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
35 37
36 CallbackType callback_; 38 CallbackType callback_;
37 }; 39 };
38 40
39 } // namespace media 41 } // namespace media
40 42
41 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_ 43 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm.cc ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698