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

Side by Side Diff: content/content_browser.gypi

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 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 | 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 '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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 'browser/android/content_view_statics.h', 237 'browser/android/content_view_statics.h',
238 'browser/android/date_time_chooser_android.cc', 238 'browser/android/date_time_chooser_android.cc',
239 'browser/android/date_time_chooser_android.h', 239 'browser/android/date_time_chooser_android.h',
240 'browser/android/download_controller_android_impl.cc', 240 'browser/android/download_controller_android_impl.cc',
241 'browser/android/download_controller_android_impl.h', 241 'browser/android/download_controller_android_impl.h',
242 'browser/android/devtools_auth.cc', 242 'browser/android/devtools_auth.cc',
243 'browser/android/interstitial_page_delegate_android.cc', 243 'browser/android/interstitial_page_delegate_android.cc',
244 'browser/android/interstitial_page_delegate_android.h', 244 'browser/android/interstitial_page_delegate_android.h',
245 'browser/android/load_url_params.cc', 245 'browser/android/load_url_params.cc',
246 'browser/android/load_url_params.h', 246 'browser/android/load_url_params.h',
247 'browser/android/media_player_manager_android.cc', 247 'browser/android/media_player_manager_impl.cc',
248 'browser/android/media_player_manager_android.h', 248 'browser/android/media_player_manager_impl.h',
249 'browser/android/media_resource_getter_impl.cc', 249 'browser/android/media_resource_getter_impl.cc',
250 'browser/android/media_resource_getter_impl.h', 250 'browser/android/media_resource_getter_impl.h',
251 'browser/android/surface_texture_peer_browser_impl.cc', 251 'browser/android/surface_texture_peer_browser_impl.cc',
252 'browser/android/surface_texture_peer_browser_impl.h', 252 'browser/android/surface_texture_peer_browser_impl.h',
253 'browser/android/sync_input_event_filter.h', 253 'browser/android/sync_input_event_filter.h',
254 'browser/android/sync_input_event_filter.cc', 254 'browser/android/sync_input_event_filter.cc',
255 'browser/android/touch_point.cc', 255 'browser/android/touch_point.cc',
256 'browser/android/touch_point.h', 256 'browser/android/touch_point.h',
257 'browser/android/tracing_intent_handler.cc', 257 'browser/android/tracing_intent_handler.cc',
258 'browser/android/tracing_intent_handler.h', 258 'browser/android/tracing_intent_handler.h',
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 '../third_party/speex/speex.gyp:libspeex', 1340 '../third_party/speex/speex.gyp:libspeex',
1341 ], 1341 ],
1342 }], 1342 }],
1343 ['linux_use_libgps==1', { 1343 ['linux_use_libgps==1', {
1344 'dependencies': [ 1344 'dependencies': [
1345 '../build/linux/system.gyp:libgps', 1345 '../build/linux/system.gyp:libgps',
1346 ], 1346 ],
1347 }], 1347 }],
1348 ], 1348 ],
1349 } 1349 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698