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

Side by Side Diff: media/cdm/player_tracker_impl.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/cdm/external_clear_key_test_helper.h ('k') | media/cdm/ppapi/cdm_file_io_test.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CDM_PLAYER_TRACKER_IMPL_H_ 5 #ifndef MEDIA_CDM_PLAYER_TRACKER_IMPL_H_
6 #define MEDIA_CDM_PLAYER_TRACKER_IMPL_H_ 6 #define MEDIA_CDM_PLAYER_TRACKER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h"
11 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
12 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
13 #include "media/base/player_tracker.h" 14 #include "media/base/player_tracker.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 // A common implementation that can be shared by different PlayerTracker 18 // A common implementation that can be shared by different PlayerTracker
18 // implementations. This class is thread safe and can be called on any thread. 19 // implementations. This class is thread safe and can be called on any thread.
19 class MEDIA_EXPORT PlayerTrackerImpl : public PlayerTracker { 20 class MEDIA_EXPORT PlayerTrackerImpl : public PlayerTracker {
20 public: 21 public:
(...skipping 24 matching lines...) Expand all
45 46
46 int next_registration_id_; 47 int next_registration_id_;
47 std::map<int, PlayerCallbacks> player_callbacks_map_; 48 std::map<int, PlayerCallbacks> player_callbacks_map_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(PlayerTrackerImpl); 50 DISALLOW_COPY_AND_ASSIGN(PlayerTrackerImpl);
50 }; 51 };
51 52
52 } // namespace media 53 } // namespace media
53 54
54 #endif // MEDIA_CDM_PLAYER_TRACKER_IMPL_H_ 55 #endif // MEDIA_CDM_PLAYER_TRACKER_IMPL_H_
OLDNEW
« no previous file with comments | « media/cdm/external_clear_key_test_helper.h ('k') | media/cdm/ppapi/cdm_file_io_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698