summaryrefslogtreecommitdiffstats
path: root/device/battery
diff options
context:
space:
mode:
authorppi <ppi@chromium.org>2014-12-19 08:39:37 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-19 16:40:28 +0000
commit31cceb724feb883a745d387a314ab80bc63c0ede (patch)
tree010f7ffa0f80fe0096bdf1a9b91ed3d83082904c /device/battery
parentebfb0de18948b49bbee7f07c406d3bbad82a3b5b (diff)
downloadchromium_src-31cceb724feb883a745d387a314ab80bc63c0ede.zip
chromium_src-31cceb724feb883a745d387a314ab80bc63c0ede.tar.gz
chromium_src-31cceb724feb883a745d387a314ab80bc63c0ede.tar.bz2
Fix Java BatteryMonitor for Android WebView.
Android WebView doesn't set the ApplicationStatus helper, BatteryMonitor should use base::android::GetApplicationContext() to get the application context instead. BUG=420623 Review URL: https://codereview.chromium.org/817693003 Cr-Commit-Position: refs/heads/master@{#309212}
Diffstat (limited to 'device/battery')
-rw-r--r--device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java b/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java
index 19498ef..c606327 100644
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java
+++ b/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java
@@ -7,7 +7,6 @@ package org.chromium.device.battery;
import android.content.Context;
import android.util.Log;
-import org.chromium.base.ApplicationStatus;
import org.chromium.base.ThreadUtils;
import org.chromium.device.battery.BatteryStatusManager.BatteryStatusCallback;
import org.chromium.mojom.device.BatteryMonitor;
@@ -39,8 +38,7 @@ public class BatteryMonitorFactory {
}
};
- public BatteryMonitorFactory() {
- Context applicationContext = ApplicationStatus.getApplicationContext();
+ public BatteryMonitorFactory(Context applicationContext) {
assert applicationContext != null;
mManager = new BatteryStatusManager(applicationContext, mCallback);
}