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

Side by Side Diff: content/content_renderer.gypi

Issue 501473003: Move EME code out of WebMediaPlayerImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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
« no previous file with comments | « no previous file | content/renderer/media/crypto/encrypted_media_player_support.h » ('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 (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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 'content_common_mojo_bindings', 7 'content_common_mojo_bindings',
8 '../base/base.gyp:base', 8 '../base/base.gyp:base',
9 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 9 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
10 '../cc/cc.gyp:cc', 10 '../cc/cc.gyp:cc',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'renderer/media/buffered_data_source_host_impl.h', 244 'renderer/media/buffered_data_source_host_impl.h',
245 'renderer/media/buffered_data_source_host_impl.cc', 245 'renderer/media/buffered_data_source_host_impl.cc',
246 'renderer/media/buffered_resource_loader.cc', 246 'renderer/media/buffered_resource_loader.cc',
247 'renderer/media/buffered_resource_loader.h', 247 'renderer/media/buffered_resource_loader.h',
248 'renderer/media/cache_util.cc', 248 'renderer/media/cache_util.cc',
249 'renderer/media/cache_util.h', 249 'renderer/media/cache_util.h',
250 'renderer/media/cdm_session_adapter.cc', 250 'renderer/media/cdm_session_adapter.cc',
251 'renderer/media/cdm_session_adapter.h', 251 'renderer/media/cdm_session_adapter.h',
252 'renderer/media/crypto/content_decryption_module_factory.cc', 252 'renderer/media/crypto/content_decryption_module_factory.cc',
253 'renderer/media/crypto/content_decryption_module_factory.h', 253 'renderer/media/crypto/content_decryption_module_factory.h',
254 'renderer/media/crypto/encrypted_media_player_support.cc',
255 'renderer/media/crypto/encrypted_media_player_support.h',
256 'renderer/media/crypto/encrypted_media_player_support_impl.cc',
257 'renderer/media/crypto/encrypted_media_player_support_impl.h',
254 'renderer/media/crypto/key_systems.cc', 258 'renderer/media/crypto/key_systems.cc',
255 'renderer/media/crypto/key_systems.h', 259 'renderer/media/crypto/key_systems.h',
256 'renderer/media/crypto/key_systems_support_uma.cc', 260 'renderer/media/crypto/key_systems_support_uma.cc',
257 'renderer/media/crypto/key_systems_support_uma.h', 261 'renderer/media/crypto/key_systems_support_uma.h',
258 'renderer/media/crypto/pepper_cdm_wrapper.h', 262 'renderer/media/crypto/pepper_cdm_wrapper.h',
259 'renderer/media/crypto/pepper_cdm_wrapper_impl.cc', 263 'renderer/media/crypto/pepper_cdm_wrapper_impl.cc',
260 'renderer/media/crypto/pepper_cdm_wrapper_impl.h', 264 'renderer/media/crypto/pepper_cdm_wrapper_impl.h',
261 'renderer/media/crypto/ppapi_decryptor.cc', 265 'renderer/media/crypto/ppapi_decryptor.cc',
262 'renderer/media/crypto/ppapi_decryptor.h', 266 'renderer/media/crypto/ppapi_decryptor.h',
263 'renderer/media/crypto/proxy_decryptor.cc', 267 'renderer/media/crypto/proxy_decryptor.cc',
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 ['OS=="win" and win_use_allocator_shim==1', { 753 ['OS=="win" and win_use_allocator_shim==1', {
750 'dependencies': [ 754 'dependencies': [
751 '../base/allocator/allocator.gyp:allocator', 755 '../base/allocator/allocator.gyp:allocator',
752 ], 756 ],
753 }], 757 }],
754 ['OS=="android"', { 758 ['OS=="android"', {
755 'sources!': [ 759 'sources!': [
756 'renderer/accessibility/renderer_accessibility_focus_only.cc', 760 'renderer/accessibility/renderer_accessibility_focus_only.cc',
757 'renderer/media/audio_decoder.cc', 761 'renderer/media/audio_decoder.cc',
758 'renderer/media/filter_helpers.cc', 762 'renderer/media/filter_helpers.cc',
763 'renderer/media/crypto/encrypted_media_player_support_impl.cc',
759 'renderer/media/webmediaplayer_impl.cc', 764 'renderer/media/webmediaplayer_impl.cc',
760 ], 765 ],
761 'sources': [ 766 'sources': [
762 'renderer/external_popup_menu.cc', 767 'renderer/external_popup_menu.cc',
763 'renderer/external_popup_menu.h', 768 'renderer/external_popup_menu.h',
764 ], 769 ],
765 'dependencies': [ 770 'dependencies': [
766 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 771 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
767 ], 772 ],
768 'includes': [ 773 'includes': [
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 }], 861 }],
857 ], 862 ],
858 'target_conditions': [ 863 'target_conditions': [
859 ['OS=="android"', { 864 ['OS=="android"', {
860 'sources/': [ 865 'sources/': [
861 ['include', '^renderer/render_view_linux\\.cc$'], 866 ['include', '^renderer/render_view_linux\\.cc$'],
862 ], 867 ],
863 }], 868 }],
864 ], 869 ],
865 } 870 }
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/crypto/encrypted_media_player_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698