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

Side by Side Diff: content/content_renderer.gypi

Issue 1102363005: Initialize the CDM asynchronously (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + Android compile changes 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 unified diff | Download patch
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 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 8 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
9 '../cc/cc.gyp:cc', 9 '../cc/cc.gyp:cc',
10 '../cc/blink/cc_blink.gyp:cc_blink', 10 '../cc/blink/cc_blink.gyp:cc_blink',
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 'renderer/media/audio_decoder.cc', 255 'renderer/media/audio_decoder.cc',
256 'renderer/media/audio_decoder.h', 256 'renderer/media/audio_decoder.h',
257 'renderer/media/audio_device_factory.cc', 257 'renderer/media/audio_device_factory.cc',
258 'renderer/media/audio_device_factory.h', 258 'renderer/media/audio_device_factory.h',
259 'renderer/media/audio_input_message_filter.cc', 259 'renderer/media/audio_input_message_filter.cc',
260 'renderer/media/audio_input_message_filter.h', 260 'renderer/media/audio_input_message_filter.h',
261 'renderer/media/audio_message_filter.cc', 261 'renderer/media/audio_message_filter.cc',
262 'renderer/media/audio_message_filter.h', 262 'renderer/media/audio_message_filter.h',
263 'renderer/media/audio_renderer_mixer_manager.cc', 263 'renderer/media/audio_renderer_mixer_manager.cc',
264 'renderer/media/audio_renderer_mixer_manager.h', 264 'renderer/media/audio_renderer_mixer_manager.h',
265 'renderer/media/crypto/cdm_initialized_promise.cc',
266 'renderer/media/crypto/cdm_initialized_promise.h',
265 'renderer/media/crypto/pepper_cdm_wrapper.h', 267 'renderer/media/crypto/pepper_cdm_wrapper.h',
266 'renderer/media/crypto/pepper_cdm_wrapper_impl.cc', 268 'renderer/media/crypto/pepper_cdm_wrapper_impl.cc',
267 'renderer/media/crypto/pepper_cdm_wrapper_impl.h', 269 'renderer/media/crypto/pepper_cdm_wrapper_impl.h',
268 'renderer/media/crypto/ppapi_decryptor.cc', 270 'renderer/media/crypto/ppapi_decryptor.cc',
269 'renderer/media/crypto/ppapi_decryptor.h', 271 'renderer/media/crypto/ppapi_decryptor.h',
270 'renderer/media/crypto/render_cdm_factory.cc', 272 'renderer/media/crypto/render_cdm_factory.cc',
271 'renderer/media/crypto/render_cdm_factory.h', 273 'renderer/media/crypto/render_cdm_factory.h',
272 'renderer/media/media_permission_dispatcher.cc', 274 'renderer/media/media_permission_dispatcher.cc',
273 'renderer/media/media_permission_dispatcher.h', 275 'renderer/media/media_permission_dispatcher.h',
274 'renderer/media/media_stream_audio_level_calculator.cc', 276 'renderer/media/media_stream_audio_level_calculator.cc',
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 }], 853 }],
852 ], 854 ],
853 'target_conditions': [ 855 'target_conditions': [
854 ['OS=="android"', { 856 ['OS=="android"', {
855 'sources/': [ 857 'sources/': [
856 ['include', '^renderer/render_view_linux\\.cc$'], 858 ['include', '^renderer/render_view_linux\\.cc$'],
857 ], 859 ],
858 }], 860 }],
859 ], 861 ],
860 } 862 }
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | content/renderer/media/crypto/cdm_initialized_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698