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

Side by Side Diff: media/base/android/media_drm_bridge_delegate.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/android/media_drm_bridge.cc ('k') | media/base/android/media_jni_registrar.cc » ('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_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_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/macros.h" 13 #include "base/macros.h"
12 #include "media/base/android/media_client_android.h" 14 #include "media/base/android/media_client_android.h"
13 #include "media/base/eme_constants.h" 15 #include "media/base/eme_constants.h"
14 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
15 17
16 namespace media { 18 namespace media {
17 19
(...skipping 19 matching lines...) Expand all
37 std::vector<uint8_t>* init_data_out, 39 std::vector<uint8_t>* init_data_out,
38 std::vector<std::string>* optional_parameters_out); 40 std::vector<std::string>* optional_parameters_out);
39 41
40 private: 42 private:
41 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridgeDelegate); 43 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridgeDelegate);
42 }; 44 };
43 45
44 } // namespace media 46 } // namespace media
45 47
46 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_ 48 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_DELEGATE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/media_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698