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

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

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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/key_systems_support_uma.h ('k') | media/cdm/aes_decryptor.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_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 <string> 8 #include <string>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 // Complete a requestMediaKeySystemAccess() request with an error message. 63 // Complete a requestMediaKeySystemAccess() request with an error message.
64 void OnRequestNotSupported(blink::WebEncryptedMediaRequest request, 64 void OnRequestNotSupported(blink::WebEncryptedMediaRequest request,
65 const blink::WebString& error_message); 65 const blink::WebString& error_message);
66 66
67 // Gets the Reporter for |key_system|. If it doesn't already exist, 67 // Gets the Reporter for |key_system|. If it doesn't already exist,
68 // create one. 68 // create one.
69 Reporter* GetReporter(const blink::WebString& key_system); 69 Reporter* GetReporter(const blink::WebString& key_system);
70 70
71 // Reporter singletons. 71 // Reporter singletons.
72 base::ScopedPtrHashMap<std::string, Reporter> reporters_; 72 base::ScopedPtrHashMap<std::string, scoped_ptr<Reporter>> reporters_;
73 73
74 CdmFactory* cdm_factory_; 74 CdmFactory* cdm_factory_;
75 KeySystemConfigSelector key_system_config_selector_; 75 KeySystemConfigSelector key_system_config_selector_;
76 base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_; 76 base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_;
77 }; 77 };
78 78
79 } // namespace media 79 } // namespace media
80 80
81 #endif // MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_ 81 #endif // MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « media/base/key_systems_support_uma.h ('k') | media/cdm/aes_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698