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

Side by Side Diff: media/blink/webencryptedmediaclient_impl.h

Issue 2600603002: Remove base::ScopedPtrHashMap from media/. (Closed)
Patch Set: rev Created 3 years, 12 months 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/cdm_promise_adapter.cc ('k') | media/blink/webencryptedmediaclient_impl.cc » ('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_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_
6 #define MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_ 6 #define MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <unordered_map>
10 11
11 #include "base/callback.h" 12 #include "base/callback.h"
12 #include "base/containers/scoped_ptr_hash_map.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "media/blink/key_system_config_selector.h" 14 #include "media/blink/key_system_config_selector.h"
15 #include "media/blink/media_blink_export.h" 15 #include "media/blink/media_blink_export.h"
16 #include "third_party/WebKit/public/platform/WebEncryptedMediaClient.h" 16 #include "third_party/WebKit/public/platform/WebEncryptedMediaClient.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 class WebContentDecryptionModuleResult; 20 class WebContentDecryptionModuleResult;
21 struct WebMediaKeySystemConfiguration; 21 struct WebMediaKeySystemConfiguration;
22 class WebSecurityOrigin; 22 class WebSecurityOrigin;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 // Complete a requestMediaKeySystemAccess() request with an error message. 67 // Complete a requestMediaKeySystemAccess() request with an error message.
68 void OnRequestNotSupported(blink::WebEncryptedMediaRequest request, 68 void OnRequestNotSupported(blink::WebEncryptedMediaRequest request,
69 const blink::WebString& error_message); 69 const blink::WebString& error_message);
70 70
71 // Gets the Reporter for |key_system|. If it doesn't already exist, 71 // Gets the Reporter for |key_system|. If it doesn't already exist,
72 // create one. 72 // create one.
73 Reporter* GetReporter(const blink::WebString& key_system); 73 Reporter* GetReporter(const blink::WebString& key_system);
74 74
75 // Reporter singletons. 75 // Reporter singletons.
76 base::ScopedPtrHashMap<std::string, std::unique_ptr<Reporter>> reporters_; 76 std::unordered_map<std::string, std::unique_ptr<Reporter>> reporters_;
77 77
78 base::Callback<bool(void)> are_secure_codecs_supported_cb_; 78 base::Callback<bool(void)> are_secure_codecs_supported_cb_;
79 CdmFactory* cdm_factory_; 79 CdmFactory* cdm_factory_;
80 KeySystemConfigSelector key_system_config_selector_; 80 KeySystemConfigSelector key_system_config_selector_;
81 base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_; 81 base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_;
82 }; 82 };
83 83
84 } // namespace media 84 } // namespace media
85 85
86 #endif // MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_ 86 #endif // MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « media/base/cdm_promise_adapter.cc ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698