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

Unified Diff: content/browser/battery_status/battery_status_manager_android.cc

Issue 356873002: battery-status: Implement the battery-status API for chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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
Index: content/browser/battery_status/battery_status_manager_android.cc
diff --git a/content/browser/battery_status/battery_status_manager_android.cc b/content/browser/battery_status/battery_status_manager_android.cc
index a8438b855720eac59a2a9726537127990cd9b9e9..fc43d4dfe7f029574d7b5529f791a8f182cb54ff 100644
--- a/content/browser/battery_status/battery_status_manager_android.cc
+++ b/content/browser/battery_status/battery_status_manager_android.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/battery_status/battery_status_manager.h"
+#include "content/browser/battery_status/battery_status_manager_android.h"
#include "base/android/jni_android.h"
+#include "base/android/scoped_java_ref.h"
#include "base/metrics/histogram.h"
#include "jni/BatteryStatusManager_jni.h"
@@ -12,7 +13,7 @@ using base::android::AttachCurrentThread;
namespace content {
-BatteryStatusManager::BatteryStatusManager(
+BatteryStatusManagerAndroid::BatteryStatusManagerAndroid(
const BatteryStatusService::BatteryUpdateCallback& callback)
: callback_(callback) {
j_manager_.Reset(
@@ -20,19 +21,20 @@ BatteryStatusManager::BatteryStatusManager(
AttachCurrentThread(), base::android::GetApplicationContext()));
}
-BatteryStatusManager::BatteryStatusManager() {
+BatteryStatusManagerAndroid::~BatteryStatusManagerAndroid() {
}
-BatteryStatusManager::~BatteryStatusManager() {
-}
-
-bool BatteryStatusManager::Register(JNIEnv* env) {
+// static
+bool BatteryStatusManagerAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);
}
-void BatteryStatusManager::GotBatteryStatus(JNIEnv*, jobject,
- jboolean charging, jdouble charging_time, jdouble discharging_time,
- jdouble level) {
+void BatteryStatusManagerAndroid::GotBatteryStatus(JNIEnv*,
+ jobject,
+ jboolean charging,
+ jdouble charging_time,
+ jdouble discharging_time,
+ jdouble level) {
blink::WebBatteryStatus status;
status.charging = charging;
status.chargingTime = charging_time;
@@ -41,16 +43,23 @@ void BatteryStatusManager::GotBatteryStatus(JNIEnv*, jobject,
callback_.Run(status);
}
-bool BatteryStatusManager::StartListeningBatteryChange() {
+bool BatteryStatusManagerAndroid::StartListeningBatteryChange() {
bool result = Java_BatteryStatusManager_start(AttachCurrentThread(),
j_manager_.obj(), reinterpret_cast<intptr_t>(this));
UMA_HISTOGRAM_BOOLEAN("BatteryStatus.StartAndroid", result);
return result;
}
-void BatteryStatusManager::StopListeningBatteryChange() {
+void BatteryStatusManagerAndroid::StopListeningBatteryChange() {
Java_BatteryStatusManager_stop(
AttachCurrentThread(), j_manager_.obj());
}
+// static
+scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create(
+ const BatteryStatusService::BatteryUpdateCallback& callback) {
+ return scoped_ptr<BatteryStatusManager>(
+ new BatteryStatusManagerAndroid(callback));
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698