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

Side by Side Diff: content/content_browser.gypi

Issue 685703002: Reland "Replace Chrome IPC with Mojo IPC for querying BatteryStatus service" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Tim's comments. Created 6 years, 1 month 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/content.gyp ('k') | content/content_common.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 '../base/base.gyp:base_static', 7 '../base/base.gyp:base_static',
8 '../crypto/crypto.gyp:crypto', 8 '../crypto/crypto.gyp:crypto',
9 '../device/battery/battery.gyp:device_battery',
10 '../device/battery/battery.gyp:device_battery_mojo_bindings',
9 '../google_apis/google_apis.gyp:google_apis', 11 '../google_apis/google_apis.gyp:google_apis',
10 '../net/net.gyp:net', 12 '../net/net.gyp:net',
11 '../skia/skia.gyp:skia', 13 '../skia/skia.gyp:skia',
12 '../sql/sql.gyp:sql', 14 '../sql/sql.gyp:sql',
13 '../third_party/re2/re2.gyp:re2', 15 '../third_party/re2/re2.gyp:re2',
14 '../third_party/zlib/google/zip.gyp:zip', 16 '../third_party/zlib/google/zip.gyp:zip',
15 '../third_party/zlib/zlib.gyp:zlib', 17 '../third_party/zlib/zlib.gyp:zlib',
16 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', 18 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
17 '../ui/accessibility/accessibility.gyp:accessibility', 19 '../ui/accessibility/accessibility.gyp:accessibility',
18 '../ui/accessibility/accessibility.gyp:ax_gen', 20 '../ui/accessibility/accessibility.gyp:ax_gen',
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 'browser/appcache/appcache_url_request_job.cc', 373 'browser/appcache/appcache_url_request_job.cc',
372 'browser/appcache/appcache_url_request_job.h', 374 'browser/appcache/appcache_url_request_job.h',
373 'browser/appcache/appcache_working_set.cc', 375 'browser/appcache/appcache_working_set.cc',
374 'browser/appcache/appcache_working_set.h', 376 'browser/appcache/appcache_working_set.h',
375 'browser/appcache/chrome_appcache_service.cc', 377 'browser/appcache/chrome_appcache_service.cc',
376 'browser/appcache/chrome_appcache_service.h', 378 'browser/appcache/chrome_appcache_service.h',
377 'browser/appcache/appcache_manifest_parser.cc', 379 'browser/appcache/appcache_manifest_parser.cc',
378 'browser/appcache/appcache_manifest_parser.h', 380 'browser/appcache/appcache_manifest_parser.h',
379 'browser/appcache/view_appcache_internals_job.cc', 381 'browser/appcache/view_appcache_internals_job.cc',
380 'browser/appcache/view_appcache_internals_job.h', 382 'browser/appcache/view_appcache_internals_job.h',
381 'browser/battery_status/battery_status_manager_android.cc',
382 'browser/battery_status/battery_status_manager_android.h',
383 'browser/battery_status/battery_status_manager_chromeos.cc',
384 'browser/battery_status/battery_status_manager_default.cc',
385 'browser/battery_status/battery_status_manager_linux.cc',
386 'browser/battery_status/battery_status_manager_linux.h',
387 'browser/battery_status/battery_status_manager_mac.cc',
388 'browser/battery_status/battery_status_manager_win.cc',
389 'browser/battery_status/battery_status_manager_win.h',
390 'browser/battery_status/battery_status_manager.h',
391 'browser/battery_status/battery_status_message_filter.cc',
392 'browser/battery_status/battery_status_message_filter.h',
393 'browser/battery_status/battery_status_service.cc',
394 'browser/battery_status/battery_status_service.h',
395 'browser/bootstrap_sandbox_mac.cc', 383 'browser/bootstrap_sandbox_mac.cc',
396 'browser/bootstrap_sandbox_mac.h', 384 'browser/bootstrap_sandbox_mac.h',
397 'browser/browser_child_process_host_impl.cc', 385 'browser/browser_child_process_host_impl.cc',
398 'browser/browser_child_process_host_impl.h', 386 'browser/browser_child_process_host_impl.h',
399 'browser/browser_context.cc', 387 'browser/browser_context.cc',
400 'browser/browser_ipc_logging.cc', 388 'browser/browser_ipc_logging.cc',
401 'browser/browser_main.cc', 389 'browser/browser_main.cc',
402 'browser/browser_main.h', 390 'browser/browser_main.h',
403 'browser/browser_main_loop.cc', 391 'browser/browser_main_loop.cc',
404 'browser/browser_main_loop.h', 392 'browser/browser_main_loop.h',
(...skipping 1394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 'defines': ['APPCACHE_USE_SIMPLE_CACHE'], 1787 'defines': ['APPCACHE_USE_SIMPLE_CACHE'],
1800 'direct_dependent_settings': { 1788 'direct_dependent_settings': {
1801 'defines': ['APPCACHE_USE_SIMPLE_CACHE'], 1789 'defines': ['APPCACHE_USE_SIMPLE_CACHE'],
1802 }, 1790 },
1803 'link_settings': { 1791 'link_settings': {
1804 'libraries': [ 1792 'libraries': [
1805 '-ljnigraphics', 1793 '-ljnigraphics',
1806 ], 1794 ],
1807 }, 1795 },
1808 'sources/': [ 1796 'sources/': [
1809 ['exclude', '^browser/battery_status/battery_status_manager_default\\.cc $'],
1810 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\ \.cc$'], 1797 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\ \.cc$'],
1811 ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], 1798 ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
1812 ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], 1799 ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
1813 ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'], 1800 ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
1814 ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'], 1801 ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
1815 ], 1802 ],
1816 'sources': [ 1803 'sources': [
1817 '<@(android_browser_sources)', 1804 '<@(android_browser_sources)',
1818 ], 1805 ],
1819 'sources!': [ 1806 'sources!': [
1820 'browser/browser_ipc_logging.cc', 1807 'browser/browser_ipc_logging.cc',
1821 'browser/font_list_async.cc', 1808 'browser/font_list_async.cc',
1822 'browser/geolocation/device_data_provider.cc', 1809 'browser/geolocation/device_data_provider.cc',
1823 'browser/geolocation/empty_device_data_provider.cc', 1810 'browser/geolocation/empty_device_data_provider.cc',
1824 'browser/geolocation/wifi_data_provider_common.cc', 1811 'browser/geolocation/wifi_data_provider_common.cc',
1825 'browser/renderer_host/native_web_keyboard_event.cc', 1812 'browser/renderer_host/native_web_keyboard_event.cc',
1826 ] 1813 ]
1827 }], 1814 }],
1828 ['OS=="mac"', { 1815 ['OS=="mac"', {
1829 'sources/': [ 1816 'sources/': [
1830 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default. cc$'], 1817 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default. cc$'],
1831 ], 1818 ],
1832 'sources!': [ 1819 'sources!': [
1833 'browser/geolocation/empty_wifi_data_provider.cc', 1820 'browser/geolocation/empty_wifi_data_provider.cc',
1834 'browser/battery_status/battery_status_manager_default.cc',
1835 ], 1821 ],
1836 'dependencies': [ 1822 'dependencies': [
1837 '../third_party/mozilla/mozilla.gyp:mozilla', 1823 '../third_party/mozilla/mozilla.gyp:mozilla',
1838 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor', 1824 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor',
1839 ], 1825 ],
1840 'link_settings': { 1826 'link_settings': {
1841 'libraries': [ 1827 'libraries': [
1842 '$(SDKROOT)/usr/lib/libbsm.dylib', 1828 '$(SDKROOT)/usr/lib/libbsm.dylib',
1843 ], 1829 ],
1844 }, 1830 },
1845 }], 1831 }],
1846 ['chromeos==1', { 1832 ['chromeos==1', {
1847 'dependencies': [ 1833 'dependencies': [
1848 '../build/linux/system.gyp:dbus', 1834 '../build/linux/system.gyp:dbus',
1849 '../chromeos/chromeos.gyp:power_manager_proto', 1835 '../chromeos/chromeos.gyp:power_manager_proto',
1850 ], 1836 ],
1851 'sources!': [ 1837 'sources!': [
1852 'browser/battery_status/battery_status_manager_default.cc',
1853 'browser/battery_status/battery_status_manager_linux.cc',
1854 'browser/geolocation/wifi_data_provider_linux.cc', 1838 'browser/geolocation/wifi_data_provider_linux.cc',
1855 'browser/power_save_blocker_ozone.cc', 1839 'browser/power_save_blocker_ozone.cc',
1856 'browser/power_save_blocker_x11.cc', 1840 'browser/power_save_blocker_x11.cc',
1857 ], 1841 ],
1858 }], 1842 }],
1859 ['os_bsd==1', { 1843 ['os_bsd==1', {
1860 'sources/': [ 1844 'sources/': [
1861 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ], 1845 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ],
1862 ], 1846 ],
1863 }], 1847 }],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1895 'sources/': [ 1879 'sources/': [
1896 ['exclude', '^browser/speech/'], 1880 ['exclude', '^browser/speech/'],
1897 ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h) $'], 1881 ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h) $'],
1898 ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'] , 1882 ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'] ,
1899 ['include', '^browser/speech/speech_recognizer\\.h$'], 1883 ['include', '^browser/speech/speech_recognizer\\.h$'],
1900 ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'], 1884 ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
1901 ], 1885 ],
1902 }], 1886 }],
1903 ['OS == "win"', { 1887 ['OS == "win"', {
1904 'sources!': [ 1888 'sources!': [
1905 'browser/battery_status/battery_status_manager_default.cc',
1906 'browser/geolocation/empty_wifi_data_provider.cc', 1889 'browser/geolocation/empty_wifi_data_provider.cc',
1907 ], 1890 ],
1908 }], 1891 }],
1909 ['OS == "linux" and use_dbus==1', { 1892 ['OS == "linux" and use_dbus==1', {
1910 'sources!': [ 1893 'sources!': [
1911 'browser/battery_status/battery_status_manager_default.cc',
1912 'browser/geolocation/empty_wifi_data_provider.cc', 1894 'browser/geolocation/empty_wifi_data_provider.cc',
1913 ], 1895 ],
1914 'dependencies': [ 1896 'dependencies': [
1915 '../build/linux/system.gyp:dbus', 1897 '../build/linux/system.gyp:dbus',
1916 '../dbus/dbus.gyp:dbus', 1898 '../dbus/dbus.gyp:dbus',
1917 ], 1899 ],
1918 }, { # OS != "linux" or use_dbus==0 1900 }, { # OS != "linux" or use_dbus==0
1919 'sources!': [ 1901 'sources!': [
1920 'browser/battery_status/battery_status_manager_linux.cc',
1921 'browser/geolocation/wifi_data_provider_linux.cc', 1902 'browser/geolocation/wifi_data_provider_linux.cc',
1922 ], 1903 ],
1923 }], 1904 }],
1924 ['enable_browser_cdms==1', { 1905 ['enable_browser_cdms==1', {
1925 'sources': [ 1906 'sources': [
1926 'browser/media/cdm/browser_cdm_manager.cc', 1907 'browser/media/cdm/browser_cdm_manager.cc',
1927 'browser/media/cdm/browser_cdm_manager.h', 1908 'browser/media/cdm/browser_cdm_manager.h',
1928 # This works on Android because enable_browser_cdms==1 on Android. 1909 # This works on Android because enable_browser_cdms==1 on Android.
1929 'browser/media/media_web_contents_observer.cc', 1910 'browser/media/media_web_contents_observer.cc',
1930 'browser/media/media_web_contents_observer.h', 1911 'browser/media/media_web_contents_observer.h',
1931 ], 1912 ],
1932 }], 1913 }],
1933 ], 1914 ],
1934 } 1915 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698