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

Side by Side Diff: content/content_browser.gypi

Issue 2192683002: Reland 2:Geolocation: move from content/browser to device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ignore size_t_to_int truncation warning Created 4 years, 4 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/web_contents/web_contents_impl.cc ('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 '../cc/cc.gyp:cc', 8 '../cc/cc.gyp:cc',
9 '../cc/cc.gyp:cc_surfaces', 9 '../cc/cc.gyp:cc_surfaces',
10 '../components/components.gyp:display_compositor', 10 '../components/components.gyp:display_compositor',
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 # The public render_widget_host.h needs to re-export skia defines. 97 # The public render_widget_host.h needs to re-export skia defines.
98 '../skia/skia.gyp:skia', 98 '../skia/skia.gyp:skia',
99 'content_common_mojo_bindings.gyp:content_common_mojo_bindings', 99 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
100 ], 100 ],
101 'include_dirs': [ 101 'include_dirs': [
102 '..', 102 '..',
103 '<(INTERMEDIATE_DIR)', 103 '<(INTERMEDIATE_DIR)',
104 ], 104 ],
105 'variables': { 105 'variables': {
106 'public_browser_sources': [ 106 'public_browser_sources': [
107 'public/browser/access_token_store.h',
108 'public/browser/android/browser_media_player_manager_register.cc', 107 'public/browser/android/browser_media_player_manager_register.cc',
109 'public/browser/android/browser_media_player_manager_register.h', 108 'public/browser/android/browser_media_player_manager_register.h',
110 'public/browser/android/compositor.h', 109 'public/browser/android/compositor.h',
111 'public/browser/android/compositor_client.h', 110 'public/browser/android/compositor_client.h',
112 'public/browser/android/content_protocol_handler.h', 111 'public/browser/android/content_protocol_handler.h',
113 'public/browser/android/content_view_core.h', 112 'public/browser/android/content_view_core.h',
114 'public/browser/android/content_view_layer_renderer.h', 113 'public/browser/android/content_view_layer_renderer.h',
115 'public/browser/android/devtools_auth.h', 114 'public/browser/android/devtools_auth.h',
116 'public/browser/android/external_video_surface_container.h', 115 'public/browser/android/external_video_surface_container.h',
117 'public/browser/android/service_registry_android.h', 116 'public/browser/android/service_registry_android.h',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 'public/browser/download_manager_delegate.h', 184 'public/browser/download_manager_delegate.h',
186 'public/browser/download_save_info.cc', 185 'public/browser/download_save_info.cc',
187 'public/browser/download_save_info.h', 186 'public/browser/download_save_info.h',
188 'public/browser/download_url_parameters.cc', 187 'public/browser/download_url_parameters.cc',
189 'public/browser/download_url_parameters.h', 188 'public/browser/download_url_parameters.h',
190 'public/browser/favicon_status.cc', 189 'public/browser/favicon_status.cc',
191 'public/browser/favicon_status.h', 190 'public/browser/favicon_status.h',
192 'public/browser/file_descriptor_info.h', 191 'public/browser/file_descriptor_info.h',
193 'public/browser/focused_node_details.h', 192 'public/browser/focused_node_details.h',
194 'public/browser/font_list_async.h', 193 'public/browser/font_list_async.h',
195 'public/browser/geolocation_delegate.cc',
196 'public/browser/geolocation_provider.h',
197 'public/browser/global_request_id.h', 194 'public/browser/global_request_id.h',
198 'public/browser/gpu_data_manager.h', 195 'public/browser/gpu_data_manager.h',
199 'public/browser/gpu_data_manager_observer.h', 196 'public/browser/gpu_data_manager_observer.h',
200 'public/browser/gpu_service_registry.cc', 197 'public/browser/gpu_service_registry.cc',
201 'public/browser/gpu_service_registry.h', 198 'public/browser/gpu_service_registry.h',
202 'public/browser/gpu_utils.cc', 199 'public/browser/gpu_utils.cc',
203 'public/browser/gpu_utils.h', 200 'public/browser/gpu_utils.h',
204 'public/browser/histogram_fetcher.h', 201 'public/browser/histogram_fetcher.h',
205 'public/browser/host_zoom_map.h', 202 'public/browser/host_zoom_map.h',
206 'public/browser/indexed_db_context.h', 203 'public/browser/indexed_db_context.h',
207 'public/browser/indexed_db_info.h', 204 'public/browser/indexed_db_info.h',
208 'public/browser/interstitial_page.h', 205 'public/browser/interstitial_page.h',
209 'public/browser/interstitial_page_delegate.cc', 206 'public/browser/interstitial_page_delegate.cc',
210 'public/browser/interstitial_page_delegate.h', 207 'public/browser/interstitial_page_delegate.h',
211 'public/browser/invalidate_type.h', 208 'public/browser/invalidate_type.h',
212 'public/browser/javascript_dialog_manager.cc', 209 'public/browser/javascript_dialog_manager.cc',
213 'public/browser/javascript_dialog_manager.h', 210 'public/browser/javascript_dialog_manager.h',
214 'public/browser/load_from_memory_cache_details.cc', 211 'public/browser/load_from_memory_cache_details.cc',
215 'public/browser/load_from_memory_cache_details.h', 212 'public/browser/load_from_memory_cache_details.h',
216 'public/browser/load_notification_details.h', 213 'public/browser/load_notification_details.h',
217 'public/browser/local_storage_usage_info.h', 214 'public/browser/local_storage_usage_info.h',
218 'public/browser/location_provider.h',
219 'public/browser/media_capture_devices.h', 215 'public/browser/media_capture_devices.h',
220 'public/browser/media_device_id.cc', 216 'public/browser/media_device_id.cc',
221 'public/browser/media_device_id.h', 217 'public/browser/media_device_id.h',
222 'public/browser/memory_pressure_controller.cc', 218 'public/browser/memory_pressure_controller.cc',
223 'public/browser/memory_pressure_controller.h', 219 'public/browser/memory_pressure_controller.h',
224 'public/browser/message_port_delegate.h', 220 'public/browser/message_port_delegate.h',
225 'public/browser/message_port_provider.h', 221 'public/browser/message_port_provider.h',
226 'public/browser/native_web_keyboard_event.h', 222 'public/browser/native_web_keyboard_event.h',
227 'public/browser/navigation_controller.cc', 223 'public/browser/navigation_controller.cc',
228 'public/browser/navigation_controller.h', 224 'public/browser/navigation_controller.h',
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 'browser/frame_host/render_frame_proxy_host.cc', 801 'browser/frame_host/render_frame_proxy_host.cc',
806 'browser/frame_host/render_frame_proxy_host.h', 802 'browser/frame_host/render_frame_proxy_host.h',
807 'browser/frame_host/render_widget_host_view_child_frame.cc', 803 'browser/frame_host/render_widget_host_view_child_frame.cc',
808 'browser/frame_host/render_widget_host_view_child_frame.h', 804 'browser/frame_host/render_widget_host_view_child_frame.h',
809 'browser/frame_host/render_widget_host_view_guest.cc', 805 'browser/frame_host/render_widget_host_view_guest.cc',
810 'browser/frame_host/render_widget_host_view_guest.h', 806 'browser/frame_host/render_widget_host_view_guest.h',
811 'browser/gamepad/gamepad_service.cc', 807 'browser/gamepad/gamepad_service.cc',
812 'browser/gamepad/gamepad_service.h', 808 'browser/gamepad/gamepad_service.h',
813 'browser/gamepad/gamepad_shared_buffer_impl.cc', 809 'browser/gamepad/gamepad_shared_buffer_impl.cc',
814 'browser/gamepad/gamepad_shared_buffer_impl.h', 810 'browser/gamepad/gamepad_shared_buffer_impl.h',
815 'browser/geolocation/empty_wifi_data_provider.cc',
816 'browser/geolocation/empty_wifi_data_provider.h',
817 'browser/geolocation/geolocation_provider_impl.cc',
818 'browser/geolocation/geolocation_provider_impl.h',
819 'browser/geolocation/geolocation_service_context.cc',
820 'browser/geolocation/geolocation_service_context.h',
821 'browser/geolocation/geolocation_service_impl.cc',
822 'browser/geolocation/geolocation_service_impl.h',
823 'browser/geolocation/location_api_adapter_android.cc',
824 'browser/geolocation/location_api_adapter_android.h',
825 'browser/geolocation/location_arbitrator.h',
826 'browser/geolocation/location_arbitrator_impl.cc',
827 'browser/geolocation/location_arbitrator_impl.h',
828 'browser/geolocation/location_provider_android.cc',
829 'browser/geolocation/location_provider_android.h',
830 'browser/geolocation/location_provider_base.cc',
831 'browser/geolocation/location_provider_base.h',
832 'browser/geolocation/network_location_provider.cc',
833 'browser/geolocation/network_location_provider.h',
834 'browser/geolocation/network_location_request.cc',
835 'browser/geolocation/network_location_request.h',
836 'browser/geolocation/wifi_data.cc',
837 'browser/geolocation/wifi_data.h',
838 'browser/geolocation/wifi_data_provider.cc',
839 'browser/geolocation/wifi_data_provider.h',
840 'browser/geolocation/wifi_data_provider_chromeos.cc',
841 'browser/geolocation/wifi_data_provider_chromeos.h',
842 'browser/geolocation/wifi_data_provider_common.cc',
843 'browser/geolocation/wifi_data_provider_common.h',
844 'browser/geolocation/wifi_data_provider_common_win.cc',
845 'browser/geolocation/wifi_data_provider_common_win.h',
846 'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
847 'browser/geolocation/wifi_data_provider_linux.cc',
848 'browser/geolocation/wifi_data_provider_linux.h',
849 'browser/geolocation/wifi_data_provider_mac.cc',
850 'browser/geolocation/wifi_data_provider_mac.h',
851 'browser/geolocation/wifi_data_provider_manager.cc',
852 'browser/geolocation/wifi_data_provider_manager.h',
853 'browser/geolocation/wifi_data_provider_win.cc',
854 'browser/geolocation/wifi_data_provider_win.h',
855 'browser/geolocation/wifi_polling_policy.h',
856 'browser/gpu/browser_gpu_channel_host_factory.cc', 811 'browser/gpu/browser_gpu_channel_host_factory.cc',
857 'browser/gpu/browser_gpu_channel_host_factory.h', 812 'browser/gpu/browser_gpu_channel_host_factory.h',
858 'browser/gpu/browser_gpu_memory_buffer_manager.cc', 813 'browser/gpu/browser_gpu_memory_buffer_manager.cc',
859 'browser/gpu/browser_gpu_memory_buffer_manager.h', 814 'browser/gpu/browser_gpu_memory_buffer_manager.h',
860 'browser/gpu/compositor_util.cc', 815 'browser/gpu/compositor_util.cc',
861 'browser/gpu/compositor_util.h', 816 'browser/gpu/compositor_util.h',
862 'browser/gpu/gpu_data_manager_impl.cc', 817 'browser/gpu/gpu_data_manager_impl.cc',
863 'browser/gpu/gpu_data_manager_impl.h', 818 'browser/gpu/gpu_data_manager_impl.h',
864 'browser/gpu/gpu_data_manager_impl_private.cc', 819 'browser/gpu/gpu_data_manager_impl_private.cc',
865 'browser/gpu/gpu_data_manager_impl_private.h', 820 'browser/gpu/gpu_data_manager_impl_private.h',
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2029 'direct_dependent_settings': { 1984 'direct_dependent_settings': {
2030 'defines': ['APPCACHE_USE_SIMPLE_CACHE'], 1985 'defines': ['APPCACHE_USE_SIMPLE_CACHE'],
2031 }, 1986 },
2032 'link_settings': { 1987 'link_settings': {
2033 'libraries': [ 1988 'libraries': [
2034 '-ljnigraphics', 1989 '-ljnigraphics',
2035 ], 1990 ],
2036 }, 1991 },
2037 'sources/': [ 1992 'sources/': [
2038 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\ \.cc$'], 1993 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\ \.cc$'],
2039 ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
2040 ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
2041 ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'], 1994 ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
2042 ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'], 1995 ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
2043 ], 1996 ],
2044 'sources': [ 1997 'sources': [
2045 '<@(android_browser_sources)', 1998 '<@(android_browser_sources)',
2046 ], 1999 ],
2047 'sources!': [ 2000 'sources!': [
2048 'browser/browser_ipc_logging.cc', 2001 'browser/browser_ipc_logging.cc',
2049 'browser/geolocation/device_data_provider.cc',
2050 'browser/geolocation/empty_device_data_provider.cc',
2051 'browser/geolocation/wifi_data_provider_common.cc',
2052 'browser/media/session/media_session_delegate_default.cc', 2002 'browser/media/session/media_session_delegate_default.cc',
2053 'browser/power_usage_monitor_impl.cc', 2003 'browser/power_usage_monitor_impl.cc',
2054 'browser/power_usage_monitor_impl.h', 2004 'browser/power_usage_monitor_impl.h',
2055 'browser/renderer_host/native_web_keyboard_event.cc', 2005 'browser/renderer_host/native_web_keyboard_event.cc',
2056 ] 2006 ]
2057 }], 2007 }],
2058 ['OS=="mac"', { 2008 ['OS=="mac"', {
2059 'sources/': [ 2009 'sources/': [
2060 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default. cc$'], 2010 ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default. cc$'],
2061 ], 2011 ],
2062 'sources!': [
2063 'browser/geolocation/empty_wifi_data_provider.cc',
2064 ],
2065 'dependencies': [ 2012 'dependencies': [
2066 '../media/media.gyp:media', 2013 '../media/media.gyp:media',
2067 '../third_party/mozilla/mozilla.gyp:mozilla', 2014 '../third_party/mozilla/mozilla.gyp:mozilla',
2068 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor', 2015 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor',
2069 '../ui/accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_wid get_mac', 2016 '../ui/accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_wid get_mac',
2070 ], 2017 ],
2071 }], 2018 }],
2072 ['chromeos==1', { 2019 ['chromeos==1', {
2073 'dependencies': [ 2020 'dependencies': [
2074 '../build/linux/system.gyp:dbus', 2021 '../build/linux/system.gyp:dbus',
2075 '../chromeos/chromeos.gyp:chromeos', 2022 '../chromeos/chromeos.gyp:chromeos',
2076 '../chromeos/chromeos.gyp:power_manager_proto', 2023 '../chromeos/chromeos.gyp:power_manager_proto',
2077 ], 2024 ],
2078 'sources!': [ 2025 'sources!': [
2079 'browser/device_sensors/data_fetcher_shared_memory_default.cc', 2026 'browser/device_sensors/data_fetcher_shared_memory_default.cc',
2080 'browser/geolocation/wifi_data_provider_linux.cc',
2081 ], 2027 ],
2082 }], 2028 }],
2083 ['use_aura==1', { 2029 ['use_aura==1', {
2084 'dependencies': [ 2030 'dependencies': [
2085 '../ui/aura/aura.gyp:aura', 2031 '../ui/aura/aura.gyp:aura',
2086 '../ui/aura_extra/aura_extra.gyp:aura_extra', 2032 '../ui/aura_extra/aura_extra.gyp:aura_extra',
2087 '../ui/strings/ui_strings.gyp:ui_strings', 2033 '../ui/strings/ui_strings.gyp:ui_strings',
2088 ], 2034 ],
2089 }, { 2035 }, {
2090 'sources/': [ 2036 'sources/': [
(...skipping 23 matching lines...) Expand all
2114 }], 2060 }],
2115 ['enable_web_speech==0 and OS=="android"', { 2061 ['enable_web_speech==0 and OS=="android"', {
2116 'sources/': [ 2062 'sources/': [
2117 ['exclude', '^browser/speech/'], 2063 ['exclude', '^browser/speech/'],
2118 ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h) $'], 2064 ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h) $'],
2119 ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'] , 2065 ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'] ,
2120 ['include', '^browser/speech/speech_recognizer\\.h$'], 2066 ['include', '^browser/speech/speech_recognizer\\.h$'],
2121 ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'], 2067 ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
2122 ], 2068 ],
2123 }], 2069 }],
2124 ['OS == "win"', {
2125 'sources!': [
2126 'browser/geolocation/empty_wifi_data_provider.cc',
2127 ],
2128 }],
2129 ['OS == "linux" and use_dbus==1', { 2070 ['OS == "linux" and use_dbus==1', {
2130 'sources!': [
2131 'browser/geolocation/empty_wifi_data_provider.cc',
2132 ],
2133 'dependencies': [ 2071 'dependencies': [
2134 '../build/linux/system.gyp:dbus', 2072 '../build/linux/system.gyp:dbus',
2135 '../dbus/dbus.gyp:dbus', 2073 '../dbus/dbus.gyp:dbus',
2136 ], 2074 ],
2137 }, { # OS != "linux" or use_dbus==0
2138 'sources!': [
2139 'browser/geolocation/wifi_data_provider_linux.cc',
2140 ],
2141 }], 2075 }],
2142 ['enable_browser_cdms==1', { 2076 ['enable_browser_cdms==1', {
2143 'sources': [ 2077 'sources': [
2144 'browser/media/cdm/browser_cdm_manager.cc', 2078 'browser/media/cdm/browser_cdm_manager.cc',
2145 'browser/media/cdm/browser_cdm_manager.h', 2079 'browser/media/cdm/browser_cdm_manager.h',
2146 ], 2080 ],
2147 }], 2081 }],
2148 ['OS == "linux"', { 2082 ['OS == "linux"', {
2149 'dependencies': [ 2083 'dependencies': [
2150 '../third_party/boringssl/boringssl.gyp:boringssl', 2084 '../third_party/boringssl/boringssl.gyp:boringssl',
(...skipping 23 matching lines...) Expand all
2174 ], 2108 ],
2175 }], 2109 }],
2176 ['OS != "mac" and OS != "android"', { 2110 ['OS != "mac" and OS != "android"', {
2177 'sources!': [ 2111 'sources!': [
2178 'browser/gpu/gpu_surface_tracker.cc', 2112 'browser/gpu/gpu_surface_tracker.cc',
2179 'browser/gpu/gpu_surface_tracker.h', 2113 'browser/gpu/gpu_surface_tracker.h',
2180 ], 2114 ],
2181 }], 2115 }],
2182 ], 2116 ],
2183 } 2117 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698