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

Side by Side Diff: media/base/android/media_player_bridge.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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PLAYER_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stdint.h>
9 #include <map> 10 #include <map>
10 #include <string> 11 #include <string>
11 12
12 #include "base/android/scoped_java_ref.h" 13 #include "base/android/scoped_java_ref.h"
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
17 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
18 #include "base/time/time.h" 19 #include "base/time/time.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 200
200 // NOTE: Weak pointers must be invalidated before all other member variables. 201 // NOTE: Weak pointers must be invalidated before all other member variables.
201 base::WeakPtrFactory<MediaPlayerBridge> weak_factory_; 202 base::WeakPtrFactory<MediaPlayerBridge> weak_factory_;
202 203
203 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge); 204 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
204 }; 205 };
205 206
206 } // namespace media 207 } // namespace media
207 208
208 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 209 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | media/base/android/media_player_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698