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

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

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/blink/cdm_session_adapter.cc ('k') | media/blink/key_system_config_selector.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 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 <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/bind.h" 12 #include "base/bind.h"
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "media/base/eme_constants.h" 16 #include "media/base/eme_constants.h"
17 #include "media/blink/media_blink_export.h" 17 #include "media/blink/media_blink_export.h"
18 #include "third_party/WebKit/public/platform/WebVector.h" 18 #include "third_party/WebKit/public/platform/WebVector.h"
19 19
20 namespace blink { 20 namespace blink {
21 21
22 struct WebMediaKeySystemConfiguration; 22 struct WebMediaKeySystemConfiguration;
23 struct WebMediaKeySystemMediaCapability; 23 struct WebMediaKeySystemMediaCapability;
24 class WebSecurityOrigin; 24 class WebSecurityOrigin;
(...skipping 28 matching lines...) Expand all
53 private: 53 private:
54 struct SelectionRequest; 54 struct SelectionRequest;
55 class ConfigState; 55 class ConfigState;
56 56
57 enum ConfigurationSupport { 57 enum ConfigurationSupport {
58 CONFIGURATION_NOT_SUPPORTED, 58 CONFIGURATION_NOT_SUPPORTED,
59 CONFIGURATION_REQUIRES_PERMISSION, 59 CONFIGURATION_REQUIRES_PERMISSION,
60 CONFIGURATION_SUPPORTED, 60 CONFIGURATION_SUPPORTED,
61 }; 61 };
62 62
63 void SelectConfigInternal(scoped_ptr<SelectionRequest> request); 63 void SelectConfigInternal(std::unique_ptr<SelectionRequest> request);
64 64
65 void OnPermissionResult(scoped_ptr<SelectionRequest> request, 65 void OnPermissionResult(std::unique_ptr<SelectionRequest> request,
66 bool is_permission_granted); 66 bool is_permission_granted);
67 67
68 ConfigurationSupport GetSupportedConfiguration( 68 ConfigurationSupport GetSupportedConfiguration(
69 const std::string& key_system, 69 const std::string& key_system,
70 const blink::WebMediaKeySystemConfiguration& candidate, 70 const blink::WebMediaKeySystemConfiguration& candidate,
71 ConfigState* config_state, 71 ConfigState* config_state,
72 blink::WebMediaKeySystemConfiguration* accumulated_configuration); 72 blink::WebMediaKeySystemConfiguration* accumulated_configuration);
73 73
74 bool GetSupportedCapabilities( 74 bool GetSupportedCapabilities(
75 const std::string& key_system, 75 const std::string& key_system,
(...skipping 13 matching lines...) Expand all
89 const KeySystems* key_systems_; 89 const KeySystems* key_systems_;
90 MediaPermission* media_permission_; 90 MediaPermission* media_permission_;
91 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_; 91 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector); 93 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector);
94 }; 94 };
95 95
96 } // namespace media 96 } // namespace media
97 97
98 #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/cdm_session_adapter.cc ('k') | media/blink/key_system_config_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698