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

Side by Side Diff: content/content_browser.gypi

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