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

Side by Side Diff: content/renderer/media/crypto/content_decryption_module_factory.h

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "media/base/media_keys.h" 11 #include "media/base/media_keys.h"
12 12
13 class GURL; 13 class GURL;
14 14
15 #if defined(ENABLE_PEPPER_CDMS) 15 #if defined(ENABLE_PEPPER_CDMS)
16 namespace WebKit { 16 namespace blink {
17 class WebFrame; 17 class WebFrame;
18 class WebMediaPlayerClient; 18 class WebMediaPlayerClient;
19 } 19 }
20 #endif // defined(ENABLE_PEPPER_CDMS) 20 #endif // defined(ENABLE_PEPPER_CDMS)
21 21
22 namespace content { 22 namespace content {
23 23
24 class RendererMediaPlayerManager; 24 class RendererMediaPlayerManager;
25 25
26 class ContentDecryptionModuleFactory { 26 class ContentDecryptionModuleFactory {
27 public: 27 public:
28 static scoped_ptr<media::MediaKeys> Create( 28 static scoped_ptr<media::MediaKeys> Create(
29 const std::string& key_system, 29 const std::string& key_system,
30 #if defined(ENABLE_PEPPER_CDMS) 30 #if defined(ENABLE_PEPPER_CDMS)
31 // TODO(ddorwin): We need different pointers for the WD API. 31 // TODO(ddorwin): We need different pointers for the WD API.
32 WebKit::WebMediaPlayerClient* web_media_player_client, 32 blink::WebMediaPlayerClient* web_media_player_client,
33 WebKit::WebFrame* web_frame, 33 blink::WebFrame* web_frame,
34 const base::Closure& destroy_plugin_cb, 34 const base::Closure& destroy_plugin_cb,
35 #elif defined(OS_ANDROID) 35 #elif defined(OS_ANDROID)
36 RendererMediaPlayerManager* manager, 36 RendererMediaPlayerManager* manager,
37 int media_keys_id, 37 int media_keys_id,
38 const GURL& frame_url, 38 const GURL& frame_url,
39 #endif // defined(ENABLE_PEPPER_CDMS) 39 #endif // defined(ENABLE_PEPPER_CDMS)
40 const media::KeyAddedCB& key_added_cb, 40 const media::KeyAddedCB& key_added_cb,
41 const media::KeyErrorCB& key_error_cb, 41 const media::KeyErrorCB& key_error_cb,
42 const media::KeyMessageCB& key_message_cb); 42 const media::KeyMessageCB& key_message_cb);
43 43
44 #if defined(ENABLE_PEPPER_CDMS) 44 #if defined(ENABLE_PEPPER_CDMS)
45 static void DestroyHelperPlugin( 45 static void DestroyHelperPlugin(
46 WebKit::WebMediaPlayerClient* web_media_player_client, 46 blink::WebMediaPlayerClient* web_media_player_client,
47 WebKit::WebFrame* web_frame); 47 blink::WebFrame* web_frame);
48 #endif // defined(ENABLE_PEPPER_CDMS) 48 #endif // defined(ENABLE_PEPPER_CDMS)
49 }; 49 };
50 50
51 } // namespace content 51 } // namespace content
52 52
53 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_ 53 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
OLDNEW
« no previous file with comments | « content/renderer/media/cache_util_unittest.cc ('k') | content/renderer/media/crypto/content_decryption_module_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698