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

Side by Side Diff: media/cdm/proxy_decryptor.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/ppapi/ppapi_cdm_adapter.h ('k') | media/cdm/stub/stub_cdm.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_CDM_PROXY_DECRYPTOR_H_ 5 #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_
6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_ 6 #define MEDIA_CDM_PROXY_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/containers/hash_tables.h" 11 #include "base/containers/hash_tables.h"
12 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
15 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
16 #include "media/base/cdm_context.h" 17 #include "media/base/cdm_context.h"
17 #include "media/base/decryptor.h" 18 #include "media/base/decryptor.h"
18 #include "media/base/eme_constants.h" 19 #include "media/base/eme_constants.h"
19 #include "media/base/media_export.h" 20 #include "media/base/media_export.h"
20 #include "media/base/media_keys.h" 21 #include "media/base/media_keys.h"
21 #include "url/gurl.h" 22 #include "url/gurl.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 157
157 // NOTE: Weak pointers must be invalidated before all other member variables. 158 // NOTE: Weak pointers must be invalidated before all other member variables.
158 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_; 159 base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
159 160
160 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); 161 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
161 }; 162 };
162 163
163 } // namespace media 164 } // namespace media
164 165
165 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_ 166 #endif // MEDIA_CDM_PROXY_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « media/cdm/ppapi/ppapi_cdm_adapter.h ('k') | media/cdm/stub/stub_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698