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

Side by Side Diff: media/blink/key_system_config_selector.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/blink/encrypted_media_player_support.h ('k') | media/blink/mock_weburlloader.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 5 #ifndef MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
6 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 6 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
15 #include "media/base/eme_constants.h" 16 #include "media/base/eme_constants.h"
16 #include "media/blink/media_blink_export.h" 17 #include "media/blink/media_blink_export.h"
17 #include "third_party/WebKit/public/platform/WebVector.h" 18 #include "third_party/WebKit/public/platform/WebVector.h"
18 19
19 namespace blink { 20 namespace blink {
20 21
21 struct WebMediaKeySystemConfiguration; 22 struct WebMediaKeySystemConfiguration;
22 struct WebMediaKeySystemMediaCapability; 23 struct WebMediaKeySystemMediaCapability;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 const KeySystems* key_systems_; 89 const KeySystems* key_systems_;
89 MediaPermission* media_permission_; 90 MediaPermission* media_permission_;
90 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_; 91 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_;
91 92
92 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector); 93 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector);
93 }; 94 };
94 95
95 } // namespace media 96 } // namespace media
96 97
97 #endif // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 98 #endif // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
OLDNEW
« no previous file with comments | « media/blink/encrypted_media_player_support.h ('k') | media/blink/mock_weburlloader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698