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

Side by Side Diff: content/content_browser.gypi

Issue 974513002: content: Split out VideoCaptureMachine from DesktopCaptureDeviceAura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix non-aura mac build Created 5 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
« no previous file with comments | « content/browser/media/capture/desktop_capture_device_aura.cc ('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 '../base/base.gyp:base_static', 7 '../base/base.gyp:base_static',
8 '../crypto/crypto.gyp:crypto', 8 '../crypto/crypto.gyp:crypto',
9 '../device/vibration/vibration.gyp:device_vibration', 9 '../device/vibration/vibration.gyp:device_vibration',
10 '../device/vibration/vibration.gyp:device_vibration_mojo_bindings', 10 '../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 }], 1765 }],
1766 ['enable_webrtc==1 and OS=="linux"', { 1766 ['enable_webrtc==1 and OS=="linux"', {
1767 'dependencies': [ 1767 'dependencies': [
1768 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc', 1768 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
1769 ], 1769 ],
1770 }], 1770 }],
1771 ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', { 1771 ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
1772 'sources': [ 1772 'sources': [
1773 'browser/media/capture/desktop_capture_device.cc', 1773 'browser/media/capture/desktop_capture_device.cc',
1774 'browser/media/capture/desktop_capture_device.h', 1774 'browser/media/capture/desktop_capture_device.h',
1775 'browser/media/capture/desktop_capture_device_aura.cc',
1776 'browser/media/capture/desktop_capture_device_aura.h',
1777 'browser/media/capture/desktop_capture_device_uma_types.cc', 1775 'browser/media/capture/desktop_capture_device_uma_types.cc',
1778 'browser/media/capture/desktop_capture_device_uma_types.h', 1776 'browser/media/capture/desktop_capture_device_uma_types.h',
1779 ], 1777 ],
1780 'dependencies': [ 1778 'dependencies': [
1781 '../third_party/webrtc/modules/modules.gyp:desktop_capture', 1779 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
1782 ], 1780 ],
1783 'defines': [ 1781 'defines': [
1784 'ENABLE_SCREEN_CAPTURE=1', 1782 'ENABLE_SCREEN_CAPTURE=1',
1785 ], 1783 ],
1786 }], 1784 }],
1785 ['enable_webrtc==1 and use_aura==1', {
1786 'sources': [
1787 "browser/media/capture/aura_window_capture_machine.cc",
1788 "browser/media/capture/aura_window_capture_machine.h",
1789 'browser/media/capture/desktop_capture_device_aura.cc',
1790 'browser/media/capture/desktop_capture_device_aura.h',
1791 ],
1792 }],
1787 ['enable_webrtc==1 and (OS=="linux" or OS=="mac")', { 1793 ['enable_webrtc==1 and (OS=="linux" or OS=="mac")', {
1788 'sources': [ 1794 'sources': [
1789 'browser/renderer_host/media/video_capture_texture_wrapper.cc', 1795 'browser/renderer_host/media/video_capture_texture_wrapper.cc',
1790 'browser/renderer_host/media/video_capture_texture_wrapper.h', 1796 'browser/renderer_host/media/video_capture_texture_wrapper.h',
1791 ], 1797 ],
1792 }], 1798 }],
1793 ['OS=="win"', { 1799 ['OS=="win"', {
1794 'dependencies': [ 1800 'dependencies': [
1795 # For accessibility 1801 # For accessibility
1796 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 1802 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1999 'browser/media/media_web_contents_observer.h', 2005 'browser/media/media_web_contents_observer.h',
2000 ], 2006 ],
2001 }], 2007 }],
2002 ['OS == "linux" and use_openssl==1', { 2008 ['OS == "linux" and use_openssl==1', {
2003 'dependencies': [ 2009 'dependencies': [
2004 '../third_party/boringssl/boringssl.gyp:boringssl', 2010 '../third_party/boringssl/boringssl.gyp:boringssl',
2005 ], 2011 ],
2006 }], 2012 }],
2007 ], 2013 ],
2008 } 2014 }
OLDNEW
« no previous file with comments | « content/browser/media/capture/desktop_capture_device_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698