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

Side by Side Diff: content/content_browser.gypi

Issue 9555014: Revert 124288 (made mac browser and ui_tests flaky) - Add Media device notification to SystemMonito… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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/browser/mac/media_device_notifications.mm ('k') | no next file » | 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/debugger/devtools_resources.gyp:devtools_resources', 7 'browser/debugger/devtools_resources.gyp:devtools_resources',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../net/net.gyp:http_server', 10 '../net/net.gyp:http_server',
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 'browser/in_process_webkit/session_storage_namespace_impl.h', 367 'browser/in_process_webkit/session_storage_namespace_impl.h',
368 'browser/in_process_webkit/webkit_thread.cc', 368 'browser/in_process_webkit/webkit_thread.cc',
369 'browser/in_process_webkit/webkit_thread.h', 369 'browser/in_process_webkit/webkit_thread.h',
370 'browser/intents/intent_injector.cc', 370 'browser/intents/intent_injector.cc',
371 'browser/intents/intent_injector.h', 371 'browser/intents/intent_injector.h',
372 'browser/intents/web_intents_dispatcher_impl.cc', 372 'browser/intents/web_intents_dispatcher_impl.cc',
373 'browser/intents/web_intents_dispatcher_impl.h', 373 'browser/intents/web_intents_dispatcher_impl.h',
374 'browser/load_from_memory_cache_details.cc', 374 'browser/load_from_memory_cache_details.cc',
375 'browser/load_from_memory_cache_details.h', 375 'browser/load_from_memory_cache_details.h',
376 'browser/load_notification_details.h', 376 'browser/load_notification_details.h',
377 'browser/mac/media_device_notifications.h',
378 'browser/mac/media_device_notifications.mm',
379 'browser/mach_broker_mac.cc', 377 'browser/mach_broker_mac.cc',
380 'browser/mach_broker_mac.h', 378 'browser/mach_broker_mac.h',
381 'browser/mime_registry_message_filter.cc', 379 'browser/mime_registry_message_filter.cc',
382 'browser/mime_registry_message_filter.h', 380 'browser/mime_registry_message_filter.h',
383 'browser/net/browser_online_state_observer.cc', 381 'browser/net/browser_online_state_observer.cc',
384 'browser/net/browser_online_state_observer.h', 382 'browser/net/browser_online_state_observer.h',
385 # TODO: These should be moved to test_support (see below), but 383 # TODO: These should be moved to test_support (see below), but
386 # are currently used by production code in automation_provider.cc. 384 # are currently used by production code in automation_provider.cc.
387 'browser/net/url_request_failed_dns_job.cc', 385 'browser/net/url_request_failed_dns_job.cc',
388 'browser/net/url_request_failed_dns_job.h', 386 'browser/net/url_request_failed_dns_job.h',
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 '../third_party/flac/flac.gyp:libflac', 775 '../third_party/flac/flac.gyp:libflac',
778 ]}], 776 ]}],
779 ['OS=="mac"', { 777 ['OS=="mac"', {
780 'sources': [ 778 'sources': [
781 # Build necessary Mozilla sources 779 # Build necessary Mozilla sources
782 '../third_party/mozilla/ComplexTextInputPanel.h', 780 '../third_party/mozilla/ComplexTextInputPanel.h',
783 '../third_party/mozilla/ComplexTextInputPanel.mm', 781 '../third_party/mozilla/ComplexTextInputPanel.mm',
784 '../third_party/mozilla/NSPasteboard+Utils.h', 782 '../third_party/mozilla/NSPasteboard+Utils.h',
785 '../third_party/mozilla/NSPasteboard+Utils.mm', 783 '../third_party/mozilla/NSPasteboard+Utils.mm',
786 ], 784 ],
787 'link_settings': {
788 'libraries': [
789 '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework',
790 ],
791 },
792 'dependencies': [ 785 'dependencies': [
793 '../base/base.gyp:closure_blocks_leopard_compat', 786 '../base/base.gyp:closure_blocks_leopard_compat',
794 ], 787 ],
795 }, { # OS!="mac" 788 }, { # OS!="mac"
796 'dependencies': [ 789 'dependencies': [
797 '../sandbox/sandbox.gyp:sandbox', 790 '../sandbox/sandbox.gyp:sandbox',
798 ], 791 ],
799 }], 792 }],
800 ['chromeos==1', { 793 ['chromeos==1', {
801 'dependencies': [ 794 'dependencies': [
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 ], 860 ],
868 }], 861 }],
869 ['input_speech==0', { 862 ['input_speech==0', {
870 'sources/': [ 863 'sources/': [
871 ['exclude', '^browser/speech/'], 864 ['exclude', '^browser/speech/'],
872 ], 865 ],
873 }], 866 }],
874 ], 867 ],
875 } 868 }
876 869
OLDNEW
« no previous file with comments | « content/browser/mac/media_device_notifications.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698