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

Side by Side Diff: media/base/android/media_player_android.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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.h ('k') | media/base/android/media_player_bridge.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_ANDROID_MEDIA_PLAYER_ANDROID_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "media/base/android/media_player_listener.h" 15 #include "media/base/android/media_player_listener.h"
15 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
16 #include "ui/gfx/geometry/size.h" 17 #include "ui/gfx/geometry/size.h"
17 #include "ui/gl/android/scoped_java_surface.h" 18 #include "ui/gl/android/scoped_java_surface.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 namespace media { 21 namespace media {
21 22
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // Weak pointer passed to |listener_| for callbacks. 151 // Weak pointer passed to |listener_| for callbacks.
151 // NOTE: Weak pointers must be invalidated before all other member variables. 152 // NOTE: Weak pointers must be invalidated before all other member variables.
152 base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_; 153 base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_;
153 154
154 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid); 155 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
155 }; 156 };
156 157
157 } // namespace media 158 } // namespace media
158 159
159 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ 160 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698