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

Unified Diff: content/content_browser.gypi

Issue 457933002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content.gyp ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 8e7d5cee71dab9b3dfd23b17072fccf05ffdc0e4..176904a4f4612bb627e4ec8f1ef7aebf2608c219 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -6,6 +6,8 @@
'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',
@@ -374,20 +376,6 @@
'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',
@@ -1764,7 +1752,6 @@
],
},
'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)$'],
@@ -1789,7 +1776,6 @@
],
'sources!': [
'browser/geolocation/empty_wifi_data_provider.cc',
- 'browser/battery_status/battery_status_manager_default.cc',
],
'dependencies': [
'../third_party/mozilla/mozilla.gyp:mozilla',
@@ -1807,8 +1793,6 @@
'../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',
@@ -1860,13 +1844,11 @@
}],
['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': [
@@ -1875,7 +1857,6 @@
],
}, { # OS != "linux" or use_dbus==0
'sources!': [
- 'browser/battery_status/battery_status_manager_linux.cc',
'browser/geolocation/wifi_data_provider_linux.cc',
],
}],
« 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