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

Side by Side Diff: media/base/android/media_drm_bridge.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_decoder_job.h ('k') | media/base/android/media_player_android.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_DRM_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
16 #include "media/base/android/provision_fetcher.h" 17 #include "media/base/android/provision_fetcher.h"
17 #include "media/base/cdm_promise_adapter.h" 18 #include "media/base/cdm_promise_adapter.h"
18 #include "media/base/media_export.h" 19 #include "media/base/media_export.h"
19 #include "media/base/media_keys.h" 20 #include "media/base/media_keys.h"
20 #include "media/base/player_tracker.h" 21 #include "media/base/player_tracker.h"
21 #include "media/cdm/player_tracker_impl.h" 22 #include "media/cdm/player_tracker_impl.h"
22 #include "url/gurl.h" 23 #include "url/gurl.h"
23 24
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 315
315 // NOTE: Weak pointers must be invalidated before all other member variables. 316 // NOTE: Weak pointers must be invalidated before all other member variables.
316 base::WeakPtrFactory<MediaDrmBridge> weak_factory_; 317 base::WeakPtrFactory<MediaDrmBridge> weak_factory_;
317 318
318 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 319 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
319 }; 320 };
320 321
321 } // namespace media 322 } // namespace media
322 323
323 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 324 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_decoder_job.h ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698