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

Unified Diff: content/browser/BUILD.gn

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 Tom's comment. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | content/browser/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index cab6cb955c95f4dbf8122a70aaeb2751aa75650d..eaac4c8f6372aff49b5a1f277fdcb1749c7df767 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -25,6 +25,7 @@ source_set("browser") {
"//content/browser/speech/proto",
"//content/public/common:common_sources",
"//crypto",
+ "//device/battery",
"//google_apis",
"//net",
"//skia",
@@ -268,22 +269,14 @@ source_set("browser") {
sources -= [ "power_save_blocker_x11.cc", ]
}
- # Dealing with battery_status_manager_*.cc and *wifi_data_provider_*.cc
- # is also a bit complicated given android, chromeos, linux and use_dbus.
- if (is_android || is_chromeos || (is_linux && use_dbus)) {
- sources -= [ "battery_status/battery_status_manager_default.cc" ]
- }
- if (is_chromeos || (is_linux && !use_dbus)) {
- # This will already have gotten removed for all non-Linux cases.
- sources -= [
- "battery_status/battery_status_manager_linux.cc",
- "geolocation/wifi_data_provider_linux.cc"
- ]
- }
-
+ # Dealing with *wifi_data_provider_*.cc is also a bit complicated given
+ # android, chromeos, linux and use_dbus.
if (is_android) {
sources -= [ "geolocation/wifi_data_provider_common.cc" ]
}
+ if (is_chromeos || (is_linux && !use_dbus)) {
+ sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
+ }
if (is_linux && use_dbus) {
sources -= [ "geolocation/empty_wifi_data_provider.cc" ]
}
@@ -414,7 +407,7 @@ source_set("browser") {
}
if (is_linux && use_dbus) {
- deps += [ "//dbus" ]
+ deps += [ "//dbus" ]
}
if (enable_browser_cdms) {
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | content/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698