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

Side by Side Diff: content/content_renderer.gypi

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments and resolving merge conflicts Created 8 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 (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 '../jingle/jingle.gyp:jingle_glue', 7 '../jingle/jingle.gyp:jingle_glue',
8 '../net/net.gyp:net', 8 '../net/net.gyp:net',
9 '../ppapi/ppapi_internal.gyp:ppapi_host', 9 '../ppapi/ppapi_internal.gyp:ppapi_host',
10 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 10 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 'renderer/media/rtc_video_decoder.cc', 133 'renderer/media/rtc_video_decoder.cc',
134 'renderer/media/rtc_video_decoder.h', 134 'renderer/media/rtc_video_decoder.h',
135 'renderer/media/stream_texture_factory_impl_android.cc', 135 'renderer/media/stream_texture_factory_impl_android.cc',
136 'renderer/media/stream_texture_factory_impl_android.h', 136 'renderer/media/stream_texture_factory_impl_android.h',
137 'renderer/media/video_capture_impl.cc', 137 'renderer/media/video_capture_impl.cc',
138 'renderer/media/video_capture_impl.h', 138 'renderer/media/video_capture_impl.h',
139 'renderer/media/video_capture_impl_manager.cc', 139 'renderer/media/video_capture_impl_manager.cc',
140 'renderer/media/video_capture_impl_manager.h', 140 'renderer/media/video_capture_impl_manager.h',
141 'renderer/media/video_capture_message_filter.cc', 141 'renderer/media/video_capture_message_filter.cc',
142 'renderer/media/video_capture_message_filter.h', 142 'renderer/media/video_capture_message_filter.h',
143 'renderer/media/webmediaplayer_proxy_impl_android.cc',
144 'renderer/media/webmediaplayer_proxy_impl_android.h',
143 'renderer/mhtml_generator.cc', 145 'renderer/mhtml_generator.cc',
144 'renderer/mhtml_generator.h', 146 'renderer/mhtml_generator.h',
145 'renderer/mouse_lock_dispatcher.cc', 147 'renderer/mouse_lock_dispatcher.cc',
146 'renderer/mouse_lock_dispatcher.h', 148 'renderer/mouse_lock_dispatcher.h',
147 'renderer/notification_provider.cc', 149 'renderer/notification_provider.cc',
148 'renderer/notification_provider.h', 150 'renderer/notification_provider.h',
149 'renderer/paint_aggregator.cc', 151 'renderer/paint_aggregator.cc',
150 'renderer/paint_aggregator.h', 152 'renderer/paint_aggregator.h',
151 'renderer/pepper/content_renderer_pepper_host_factory.cc', 153 'renderer/pepper/content_renderer_pepper_host_factory.cc',
152 'renderer/pepper/content_renderer_pepper_host_factory.h', 154 'renderer/pepper/content_renderer_pepper_host_factory.h',
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 }], 361 }],
360 ], 362 ],
361 'target_conditions': [ 363 'target_conditions': [
362 ['OS=="android"', { 364 ['OS=="android"', {
363 'sources/': [ 365 'sources/': [
364 ['include', '^renderer/render_view_linux\\.cc$'], 366 ['include', '^renderer/render_view_linux\\.cc$'],
365 ], 367 ],
366 }], 368 }],
367 ], 369 ],
368 } 370 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698