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

Side by Side Diff: content/content_browser.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
« no previous file with comments | « content/common/view_messages.h ('k') | content/content_jni.gypi » ('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 'browser/speech/proto/speech_proto.gyp:speech_proto', 7 'browser/speech/proto/speech_proto.gyp:speech_proto',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../google_apis/google_apis.gyp:google_apis', 10 '../google_apis/google_apis.gyp:google_apis',
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 'browser/android/content_startup_flags.cc', 196 'browser/android/content_startup_flags.cc',
197 'browser/android/content_startup_flags.h', 197 'browser/android/content_startup_flags.h',
198 'browser/android/content_video_view.cc', 198 'browser/android/content_video_view.cc',
199 'browser/android/content_video_view.h', 199 'browser/android/content_video_view.h',
200 'browser/android/content_view_client.cc', 200 'browser/android/content_view_client.cc',
201 'browser/android/content_view_client.h', 201 'browser/android/content_view_client.h',
202 'browser/android/content_view_core_impl.cc', 202 'browser/android/content_view_core_impl.cc',
203 'browser/android/content_view_core_impl.h', 203 'browser/android/content_view_core_impl.h',
204 'browser/android/content_view_statics.cc', 204 'browser/android/content_view_statics.cc',
205 'browser/android/content_view_statics.h', 205 'browser/android/content_view_statics.h',
206 'browser/android/cookie_getter_impl.cc',
207 'browser/android/cookie_getter_impl.h',
206 'browser/android/download_controller.cc', 208 'browser/android/download_controller.cc',
207 'browser/android/download_controller.h', 209 'browser/android/download_controller.h',
208 'browser/android/devtools_auth.cc', 210 'browser/android/devtools_auth.cc',
209 'browser/android/draw_delegate_impl.h', 211 'browser/android/draw_delegate_impl.h',
210 'browser/android/draw_delegate_impl.cc', 212 'browser/android/draw_delegate_impl.cc',
211 'browser/android/load_url_params.cc', 213 'browser/android/load_url_params.cc',
212 'browser/android/load_url_params.h', 214 'browser/android/load_url_params.h',
215 'browser/android/media_player_manager_android.cc',
216 'browser/android/media_player_manager_android.h',
213 'browser/android/sandboxed_process_launcher.cc', 217 'browser/android/sandboxed_process_launcher.cc',
214 'browser/android/sandboxed_process_launcher.h', 218 'browser/android/sandboxed_process_launcher.h',
219 'browser/android/surface_texture_peer_browser_impl.cc',
220 'browser/android/surface_texture_peer_browser_impl.h',
215 'browser/android/touch_point.cc', 221 'browser/android/touch_point.cc',
216 'browser/android/touch_point.h', 222 'browser/android/touch_point.h',
217 'browser/android/web_contents_observer_android.cc', 223 'browser/android/web_contents_observer_android.cc',
218 'browser/android/web_contents_observer_android.h', 224 'browser/android/web_contents_observer_android.h',
219 'browser/appcache/appcache_dispatcher_host.cc', 225 'browser/appcache/appcache_dispatcher_host.cc',
220 'browser/appcache/appcache_dispatcher_host.h', 226 'browser/appcache/appcache_dispatcher_host.h',
221 'browser/appcache/appcache_frontend_proxy.cc', 227 'browser/appcache/appcache_frontend_proxy.cc',
222 'browser/appcache/appcache_frontend_proxy.h', 228 'browser/appcache/appcache_frontend_proxy.h',
223 'browser/appcache/chrome_appcache_service.cc', 229 'browser/appcache/chrome_appcache_service.cc',
224 'browser/appcache/chrome_appcache_service.h', 230 'browser/appcache/chrome_appcache_service.h',
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 ['exclude', '^browser/renderer_host/java/'], 1052 ['exclude', '^browser/renderer_host/java/'],
1047 ], 1053 ],
1048 }], 1054 }],
1049 ['input_speech==0', { 1055 ['input_speech==0', {
1050 'sources/': [ 1056 'sources/': [
1051 ['exclude', '^browser/speech/'], 1057 ['exclude', '^browser/speech/'],
1052 ], 1058 ],
1053 }], 1059 }],
1054 ], 1060 ],
1055 } 1061 }
OLDNEW
« no previous file with comments | « content/common/view_messages.h ('k') | content/content_jni.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698