webkit/media/crypto/proxy_decryptor.cc - Issue 11931019: Update some #includes in webkit/media/crypto for headers that were moved from WebKit/chromium/publi…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/media/crypto/proxy_decryptor.cc

Issue 11931019: Update some #includes in webkit/media/crypto for headers that were moved from WebKit/chromium/publi… (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 7 years, 11 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

« no previous file with comments | « webkit/media/crypto/key_systems_unittest.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "webkit/media/crypto/proxy_decryptor.h"	5 #include "webkit/media/crypto/proxy_decryptor.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/callback_helpers.h"	8 #include "base/callback_helpers.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "media/crypto/aes_decryptor.h"	10 #include "media/crypto/aes_decryptor.h"

	11 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"

11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"

13 #include "webkit/media/crypto/key_systems.h"	13 #include "webkit/media/crypto/key_systems.h"

14 #include "webkit/media/crypto/ppapi_decryptor.h"	14 #include "webkit/media/crypto/ppapi_decryptor.h"

15 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"	15 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"

16 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"	16 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"

17 // TODO(xhwang): Put this include after "ppapi_plugin_instance.h" for definition	17 // TODO(xhwang): Put this include after "ppapi_plugin_instance.h" for definition

18 // of "uint8_t", which WebMediaPlayer.h uses without including a header for it.	18 // of "uint8_t", which WebMediaPlayer.h uses without including a header for it.

19 // See: https://bugs.webkit.org/show_bug.cgi?id=92031	19 // See: https://bugs.webkit.org/show_bug.cgi?id=92031

20 // Fix include order here when the bug is fixed.	20 // Fix include order here when the bug is fixed.

21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"	21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"

22	22

(...skipping 172 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195 void ProxyDecryptor::NeedKey(const std::string& key_system,	195 void ProxyDecryptor::NeedKey(const std::string& key_system,

196 const std::string& session_id,	196 const std::string& session_id,

197 const std::string& type,	197 const std::string& type,

198 scoped_array<uint8> init_data,	198 scoped_array<uint8> init_data,

199 int init_data_size) {	199 int init_data_size) {

200 need_key_cb_.Run(key_system, session_id, type,	200 need_key_cb_.Run(key_system, session_id, type,

201 init_data.Pass(), init_data_size);	201 init_data.Pass(), init_data_size);

202 }	202 }

203	203

204 } // namespace webkit_media	204 } // namespace webkit_media

OLD	NEW