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

Side by Side Diff: media/base/android/media_source_player.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_player_listener.h ('k') | media/base/android/video_decoder_job.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_SOURCE_PLAYER_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/android/scoped_java_ref.h" 13 #include "base/android/scoped_java_ref.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/cancelable_callback.h" 15 #include "base/cancelable_callback.h"
16 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
18 #include "base/threading/thread.h" 19 #include "base/threading/thread.h"
19 #include "base/time/default_tick_clock.h" 20 #include "base/time/default_tick_clock.h"
20 #include "base/time/time.h" 21 #include "base/time/time.h"
21 #include "media/base/android/demuxer_android.h" 22 #include "media/base/android/demuxer_android.h"
22 #include "media/base/android/media_codec_bridge.h" 23 #include "media/base/android/media_codec_bridge.h"
23 #include "media/base/android/media_decoder_job.h" 24 #include "media/base/android/media_decoder_job.h"
24 #include "media/base/android/media_drm_bridge.h" 25 #include "media/base/android/media_drm_bridge.h"
25 #include "media/base/android/media_player_android.h" 26 #include "media/base/android/media_player_android.h"
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 base::WeakPtr<MediaSourcePlayer> weak_this_; 279 base::WeakPtr<MediaSourcePlayer> weak_this_;
279 // NOTE: Weak pointers must be invalidated before all other member variables. 280 // NOTE: Weak pointers must be invalidated before all other member variables.
280 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_; 281 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
281 282
282 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer); 283 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
283 }; 284 };
284 285
285 } // namespace media 286 } // namespace media
286 287
287 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 288 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
OLDNEW
« no previous file with comments | « media/base/android/media_player_listener.h ('k') | media/base/android/video_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698