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

Side by Side Diff: media/base/media_keys.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/base/media_file_checker.cc ('k') | media/base/media_log.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_MEDIA_KEYS_H_ 5 #ifndef MEDIA_BASE_MEDIA_KEYS_H_
6 #define MEDIA_BASE_MEDIA_KEYS_H_ 6 #define MEDIA_BASE_MEDIA_KEYS_H_
7 7
8 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 #include <vector> 11 #include <vector>
10 12
11 #include "base/callback.h" 13 #include "base/callback.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 17 #include "base/memory/scoped_vector.h"
16 #include "media/base/eme_constants.h" 18 #include "media/base/eme_constants.h"
17 #include "media/base/media_export.h" 19 #include "media/base/media_export.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 218
217 // Called when the CDM changes the expiration time of a session. 219 // Called when the CDM changes the expiration time of a session.
218 // See http://w3c.github.io/encrypted-media/#update-expiration 220 // See http://w3c.github.io/encrypted-media/#update-expiration
219 typedef base::Callback<void(const std::string& session_id, 221 typedef base::Callback<void(const std::string& session_id,
220 const base::Time& new_expiry_time)> 222 const base::Time& new_expiry_time)>
221 SessionExpirationUpdateCB; 223 SessionExpirationUpdateCB;
222 224
223 } // namespace media 225 } // namespace media
224 226
225 #endif // MEDIA_BASE_MEDIA_KEYS_H_ 227 #endif // MEDIA_BASE_MEDIA_KEYS_H_
OLDNEW
« no previous file with comments | « media/base/media_file_checker.cc ('k') | media/base/media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698