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

Unified Diff: media/blink/key_system_config_selector.h

Issue 1137993004: Revert of Restrict use of hardware-secure codecs based on the RendererPreference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setsecurity
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/key_system_config_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/key_system_config_selector.h
diff --git a/media/blink/key_system_config_selector.h b/media/blink/key_system_config_selector.h
index 0d84fe3b17683701d33d2d4eb3c0caa198122cf4..86eec7efaa28baca9805311d8332ed92262c54a1 100644
--- a/media/blink/key_system_config_selector.h
+++ b/media/blink/key_system_config_selector.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/bind.h"
-#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/base/eme_constants.h"
@@ -32,9 +31,8 @@
class MEDIA_EXPORT KeySystemConfigSelector {
public:
- KeySystemConfigSelector(
- const KeySystems* key_systems,
- MediaPermission* media_permission);
+ KeySystemConfigSelector(const KeySystems* key_systems,
+ MediaPermission* media_permission);
~KeySystemConfigSelector();
@@ -43,10 +41,8 @@
const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
candidate_configurations,
const blink::WebSecurityOrigin& security_origin,
- bool are_secure_codecs_supported,
- // The second argument is |are_secure_codecs_required|.
- base::Callback<void(const blink::WebMediaKeySystemConfiguration&,
- bool)> succeeded_cb,
+ base::Callback<void(const blink::WebMediaKeySystemConfiguration&)>
+ succeeded_cb,
base::Callback<void(const blink::WebString&)> not_supported_cb);
private:
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/key_system_config_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698