| Index: content/content_browser.gypi
|
| diff --git a/content/content_browser.gypi b/content/content_browser.gypi
|
| index fc167a7ac4f4329a329be4dc742fc2ddba9dae10..b2e578715403f07fece30855eda83d77a75f5648 100644
|
| --- a/content/content_browser.gypi
|
| +++ b/content/content_browser.gypi
|
| @@ -6,8 +6,6 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base_static',
|
| '../crypto/crypto.gyp:crypto',
|
| - '../device/battery/battery.gyp:device_battery',
|
| - '../device/battery/battery.gyp:device_battery_mojo_bindings',
|
| '../google_apis/google_apis.gyp:google_apis',
|
| '../net/net.gyp:net',
|
| '../skia/skia.gyp:skia',
|
| @@ -381,6 +379,20 @@
|
| 'browser/appcache/appcache_manifest_parser.h',
|
| 'browser/appcache/view_appcache_internals_job.cc',
|
| 'browser/appcache/view_appcache_internals_job.h',
|
| + 'browser/battery_status/battery_status_manager_android.cc',
|
| + 'browser/battery_status/battery_status_manager_android.h',
|
| + 'browser/battery_status/battery_status_manager_chromeos.cc',
|
| + 'browser/battery_status/battery_status_manager_default.cc',
|
| + 'browser/battery_status/battery_status_manager_linux.cc',
|
| + 'browser/battery_status/battery_status_manager_linux.h',
|
| + 'browser/battery_status/battery_status_manager_mac.cc',
|
| + 'browser/battery_status/battery_status_manager_win.cc',
|
| + 'browser/battery_status/battery_status_manager_win.h',
|
| + 'browser/battery_status/battery_status_manager.h',
|
| + 'browser/battery_status/battery_status_message_filter.cc',
|
| + 'browser/battery_status/battery_status_message_filter.h',
|
| + 'browser/battery_status/battery_status_service.cc',
|
| + 'browser/battery_status/battery_status_service.h',
|
| 'browser/bootstrap_sandbox_mac.cc',
|
| 'browser/bootstrap_sandbox_mac.h',
|
| 'browser/browser_child_process_host_impl.cc',
|
| @@ -1793,6 +1805,7 @@
|
| ],
|
| },
|
| 'sources/': [
|
| + ['exclude', '^browser/battery_status/battery_status_manager_default\\.cc$'],
|
| ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'],
|
| ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
|
| ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
|
| @@ -1817,6 +1830,7 @@
|
| ],
|
| 'sources!': [
|
| 'browser/geolocation/empty_wifi_data_provider.cc',
|
| + 'browser/battery_status/battery_status_manager_default.cc',
|
| ],
|
| 'dependencies': [
|
| '../third_party/mozilla/mozilla.gyp:mozilla',
|
| @@ -1834,6 +1848,8 @@
|
| '../chromeos/chromeos.gyp:power_manager_proto',
|
| ],
|
| 'sources!': [
|
| + 'browser/battery_status/battery_status_manager_default.cc',
|
| + 'browser/battery_status/battery_status_manager_linux.cc',
|
| 'browser/geolocation/wifi_data_provider_linux.cc',
|
| 'browser/power_save_blocker_ozone.cc',
|
| 'browser/power_save_blocker_x11.cc',
|
| @@ -1885,11 +1901,13 @@
|
| }],
|
| ['OS == "win"', {
|
| 'sources!': [
|
| + 'browser/battery_status/battery_status_manager_default.cc',
|
| 'browser/geolocation/empty_wifi_data_provider.cc',
|
| ],
|
| }],
|
| ['OS == "linux" and use_dbus==1', {
|
| 'sources!': [
|
| + 'browser/battery_status/battery_status_manager_default.cc',
|
| 'browser/geolocation/empty_wifi_data_provider.cc',
|
| ],
|
| 'dependencies': [
|
| @@ -1898,6 +1916,7 @@
|
| ],
|
| }, { # OS != "linux" or use_dbus==0
|
| 'sources!': [
|
| + 'browser/battery_status/battery_status_manager_linux.cc',
|
| 'browser/geolocation/wifi_data_provider_linux.cc',
|
| ],
|
| }],
|
|
|