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

Side by Side Diff: media/base/cdm_initialized_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 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/base/cdm_callback_promise.h ('k') | media/base/cdm_key_information.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_BASE_CDM_INITIALIZED_PROMISE_H_ 5 #ifndef MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
6 #define MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_ 6 #define MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
7 7
8 #include <stdint.h>
9
8 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
9 #include "media/base/cdm_factory.h" 11 #include "media/base/cdm_factory.h"
10 #include "media/base/cdm_promise.h" 12 #include "media/base/cdm_promise.h"
11 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
12 #include "media/base/media_keys.h" 14 #include "media/base/media_keys.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 // Promise to be resolved when the CDM is initialized. It owns the MediaKeys 18 // Promise to be resolved when the CDM is initialized. It owns the MediaKeys
17 // object until the initialization completes, which it then passes to 19 // object until the initialization completes, which it then passes to
(...skipping 13 matching lines...) Expand all
31 private: 33 private:
32 CdmCreatedCB cdm_created_cb_; 34 CdmCreatedCB cdm_created_cb_;
33 35
34 // Holds a ref-count of the CDM. 36 // Holds a ref-count of the CDM.
35 scoped_refptr<MediaKeys> cdm_; 37 scoped_refptr<MediaKeys> cdm_;
36 }; 38 };
37 39
38 } // namespace media 40 } // namespace media
39 41
40 #endif // MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_ 42 #endif // MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
OLDNEW
« no previous file with comments | « media/base/cdm_callback_promise.h ('k') | media/base/cdm_key_information.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698