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

Side by Side Diff: trunk/src/content/renderer/media/crypto/key_systems_info.h

Issue 23708020: Revert 222074 "Refactor KeySystems code to call a function to po..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 // TODO(ddorwin): Remove when AddKeySystems is removed.
12 #include "content/public/renderer/key_system_info.h"
13 11
14 namespace WebKit { 12 namespace WebKit {
15 class WebString; 13 class WebString;
16 } 14 }
17 15
18 namespace content { 16 namespace content {
19 17
20 // TODO(ddorwin): Move registration to ContentClient. 18 // TODO(ddorwin): Move registration to ContentClient.
21 void AddKeySystems(std::vector<KeySystemInfo>* key_systems_info); 19 void RegisterKeySystems();
22 20
23 // Returns true if canPlayType should return an empty string for |key_system|. 21 // Returns true if canPlayType should return an empty string for |key_system|.
24 bool IsCanPlayTypeSuppressed(const std::string& key_system); 22 bool IsCanPlayTypeSuppressed(const std::string& key_system);
25 23
26 // Returns the name that UMA will use for the given |key_system|. 24 // Returns the name that UMA will use for the given |key_system|.
27 // This function can be called frequently. Hence this function should be 25 // This function can be called frequently. Hence this function should be
28 // implemented not to impact performance and does not rely on the main 26 // implemented not to impact performance and does not rely on the main
29 // key system map. 27 // key system map.
30 std::string KeySystemNameForUMAInternal(const WebKit::WebString& key_system); 28 std::string KeySystemNameForUMAInternal(const WebKit::WebString& key_system);
31 29
32 } // namespace content 30 } // namespace content
33 31
34 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_ 32 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/media/crypto/key_systems.cc ('k') | trunk/src/content/renderer/media/crypto/key_systems_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698