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

Side by Side Diff: content/content_browser.gypi

Issue 592153002: 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, 2 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
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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 'browser/appcache/appcache_url_request_job.cc', 369 'browser/appcache/appcache_url_request_job.cc',
368 'browser/appcache/appcache_url_request_job.h', 370 'browser/appcache/appcache_url_request_job.h',
369 'browser/appcache/appcache_working_set.cc', 371 'browser/appcache/appcache_working_set.cc',
370 'browser/appcache/appcache_working_set.h', 372 'browser/appcache/appcache_working_set.h',
371 'browser/appcache/chrome_appcache_service.cc', 373 'browser/appcache/chrome_appcache_service.cc',
372 'browser/appcache/chrome_appcache_service.h', 374 'browser/appcache/chrome_appcache_service.h',
373 'browser/appcache/appcache_manifest_parser.cc', 375 'browser/appcache/appcache_manifest_parser.cc',
374 'browser/appcache/appcache_manifest_parser.h', 376 'browser/appcache/appcache_manifest_parser.h',
375 'browser/appcache/view_appcache_internals_job.cc', 377 'browser/appcache/view_appcache_internals_job.cc',
376 'browser/appcache/view_appcache_internals_job.h', 378 'browser/appcache/view_appcache_internals_job.h',
377 'browser/battery_status/battery_status_manager_android.cc',
378 'browser/battery_status/battery_status_manager_android.h',
379 'browser/battery_status/battery_status_manager_chromeos.cc',
380 'browser/battery_status/battery_status_manager_default.cc',
381 'browser/battery_status/battery_status_manager_linux.cc',
382 'browser/battery_status/battery_status_manager_linux.h',
383 'browser/battery_status/battery_status_manager_mac.cc',
384 'browser/battery_status/battery_status_manager_win.cc',
385 'browser/battery_status/battery_status_manager_win.h',
386 'browser/battery_status/battery_status_manager.h',
387 'browser/battery_status/battery_status_message_filter.cc',
388 'browser/battery_status/battery_status_message_filter.h',
389 'browser/battery_status/battery_status_service.cc',
390 'browser/battery_status/battery_status_service.h',
391 'browser/bootstrap_sandbox_mac.cc', 379 'browser/bootstrap_sandbox_mac.cc',
392 'browser/bootstrap_sandbox_mac.h', 380 'browser/bootstrap_sandbox_mac.h',
393 'browser/browser_child_process_host_impl.cc', 381 'browser/browser_child_process_host_impl.cc',
394 'browser/browser_child_process_host_impl.h', 382 'browser/browser_child_process_host_impl.h',
395 'browser/browser_context.cc', 383 'browser/browser_context.cc',
396 'browser/browser_ipc_logging.cc', 384 'browser/browser_ipc_logging.cc',
397 'browser/browser_main.cc', 385 'browser/browser_main.cc',
398 'browser/browser_main.h', 386 'browser/browser_main.h',
399 'browser/browser_main_loop.cc', 387 'browser/browser_main_loop.cc',
400 'browser/browser_main_loop.h', 388 'browser/browser_main_loop.h',
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1760 'defines': ['APPCACHE_USE_SIMPLE_CACHE'], 1748 'defines': ['APPCACHE_USE_SIMPLE_CACHE'],
1761 'direct_dependent_settings': { 1749 'direct_dependent_settings': {
1762 'defines': ['APPCACHE_USE_SIMPLE_CACHE'], 1750 'defines': ['APPCACHE_USE_SIMPLE_CACHE'],
1763 }, 1751 },
1764 'link_settings': { 1752 'link_settings': {
1765 'libraries': [ 1753 'libraries': [
1766 '-ljnigraphics', 1754 '-ljnigraphics',
1767 ], 1755 ],
1768 }, 1756 },
1769 'sources/': [ 1757 'sources/': [
1770 ['exclude', '^browser/battery_status/battery_status_manager_default\\.cc $'],
1771 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\ \.cc$'], 1758 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\ \.cc$'],
1772 ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], 1759 ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
1773 ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], 1760 ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
1774 ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'], 1761 ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
1775 ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'], 1762 ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
1776 ], 1763 ],
1777 'sources': [ 1764 'sources': [
1778 '<@(android_browser_sources)', 1765 '<@(android_browser_sources)',
1779 ], 1766 ],
1780 'sources!': [ 1767 'sources!': [
1781 'browser/browser_ipc_logging.cc', 1768 'browser/browser_ipc_logging.cc',
1782 'browser/font_list_async.cc', 1769 'browser/font_list_async.cc',
1783 'browser/geolocation/device_data_provider.cc', 1770 'browser/geolocation/device_data_provider.cc',
1784 'browser/geolocation/empty_device_data_provider.cc', 1771 'browser/geolocation/empty_device_data_provider.cc',
1785 'browser/geolocation/wifi_data_provider_common.cc', 1772 'browser/geolocation/wifi_data_provider_common.cc',
1786 'browser/renderer_host/native_web_keyboard_event.cc', 1773 'browser/renderer_host/native_web_keyboard_event.cc',
1787 ] 1774 ]
1788 }], 1775 }],
1789 ['OS=="mac"', { 1776 ['OS=="mac"', {
1790 'sources/': [ 1777 'sources/': [
1791 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default. cc$'], 1778 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default. cc$'],
1792 ], 1779 ],
1793 'sources!': [ 1780 'sources!': [
1794 'browser/geolocation/empty_wifi_data_provider.cc', 1781 'browser/geolocation/empty_wifi_data_provider.cc',
1795 'browser/battery_status/battery_status_manager_default.cc',
1796 ], 1782 ],
1797 'dependencies': [ 1783 'dependencies': [
1798 '../third_party/mozilla/mozilla.gyp:mozilla', 1784 '../third_party/mozilla/mozilla.gyp:mozilla',
1799 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor', 1785 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor',
1800 ], 1786 ],
1801 'link_settings': { 1787 'link_settings': {
1802 'libraries': [ 1788 'libraries': [
1803 '$(SDKROOT)/usr/lib/libbsm.dylib', 1789 '$(SDKROOT)/usr/lib/libbsm.dylib',
1804 ], 1790 ],
1805 }, 1791 },
1806 }], 1792 }],
1807 ['chromeos==1', { 1793 ['chromeos==1', {
1808 'dependencies': [ 1794 'dependencies': [
1809 '../build/linux/system.gyp:dbus', 1795 '../build/linux/system.gyp:dbus',
1810 '../chromeos/chromeos.gyp:power_manager_proto', 1796 '../chromeos/chromeos.gyp:power_manager_proto',
1811 ], 1797 ],
1812 'sources!': [ 1798 'sources!': [
1813 'browser/battery_status/battery_status_manager_default.cc',
1814 'browser/battery_status/battery_status_manager_linux.cc',
1815 'browser/geolocation/wifi_data_provider_linux.cc', 1799 'browser/geolocation/wifi_data_provider_linux.cc',
1816 'browser/power_save_blocker_ozone.cc', 1800 'browser/power_save_blocker_ozone.cc',
1817 'browser/power_save_blocker_x11.cc', 1801 'browser/power_save_blocker_x11.cc',
1818 ], 1802 ],
1819 }], 1803 }],
1820 ['os_bsd==1', { 1804 ['os_bsd==1', {
1821 'sources/': [ 1805 'sources/': [
1822 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ], 1806 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ],
1823 ], 1807 ],
1824 }], 1808 }],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 'sources/': [ 1840 'sources/': [
1857 ['exclude', '^browser/speech/'], 1841 ['exclude', '^browser/speech/'],
1858 ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h) $'], 1842 ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h) $'],
1859 ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'] , 1843 ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'] ,
1860 ['include', '^browser/speech/speech_recognizer\\.h$'], 1844 ['include', '^browser/speech/speech_recognizer\\.h$'],
1861 ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'], 1845 ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
1862 ], 1846 ],
1863 }], 1847 }],
1864 ['OS == "win"', { 1848 ['OS == "win"', {
1865 'sources!': [ 1849 'sources!': [
1866 'browser/battery_status/battery_status_manager_default.cc',
1867 'browser/geolocation/empty_wifi_data_provider.cc', 1850 'browser/geolocation/empty_wifi_data_provider.cc',
1868 ], 1851 ],
1869 }], 1852 }],
1870 ['OS == "linux" and use_dbus==1', { 1853 ['OS == "linux" and use_dbus==1', {
1871 'sources!': [ 1854 'sources!': [
1872 'browser/battery_status/battery_status_manager_default.cc',
1873 'browser/geolocation/empty_wifi_data_provider.cc', 1855 'browser/geolocation/empty_wifi_data_provider.cc',
1874 ], 1856 ],
1875 'dependencies': [ 1857 'dependencies': [
1876 '../build/linux/system.gyp:dbus', 1858 '../build/linux/system.gyp:dbus',
1877 '../dbus/dbus.gyp:dbus', 1859 '../dbus/dbus.gyp:dbus',
1878 ], 1860 ],
1879 }, { # OS != "linux" or use_dbus==0 1861 }, { # OS != "linux" or use_dbus==0
1880 'sources!': [ 1862 'sources!': [
1881 'browser/battery_status/battery_status_manager_linux.cc',
1882 'browser/geolocation/wifi_data_provider_linux.cc', 1863 'browser/geolocation/wifi_data_provider_linux.cc',
1883 ], 1864 ],
1884 }], 1865 }],
1885 ['enable_browser_cdms==1', { 1866 ['enable_browser_cdms==1', {
1886 'sources': [ 1867 'sources': [
1887 'browser/media/cdm/browser_cdm_manager.cc', 1868 'browser/media/cdm/browser_cdm_manager.cc',
1888 'browser/media/cdm/browser_cdm_manager.h', 1869 'browser/media/cdm/browser_cdm_manager.h',
1889 # This works on Android because enable_browser_cdms==1 on Android. 1870 # This works on Android because enable_browser_cdms==1 on Android.
1890 'browser/media/media_web_contents_observer.cc', 1871 'browser/media/media_web_contents_observer.cc',
1891 'browser/media/media_web_contents_observer.h', 1872 'browser/media/media_web_contents_observer.h',
1892 ], 1873 ],
1893 }], 1874 }],
1894 ], 1875 ],
1895 } 1876 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698