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

Unified Diff: base/system_monitor/system_monitor_android.cc

Issue 11027024: Android: Integrates native and java SystemMonitor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Vandebo's comments Created 8 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
Index: base/system_monitor/system_monitor_android.cc
diff --git a/base/system_monitor/system_monitor_android.cc b/base/system_monitor/system_monitor_android.cc
index c86076d2a84baaaf1a20ec489ddbffdc46af7e7d..8573e45c287c84555a6622287ddbaed11ab9ba6e 100644
--- a/base/system_monitor/system_monitor_android.cc
+++ b/base/system_monitor/system_monitor_android.cc
@@ -3,12 +3,27 @@
// found in the LICENSE file.
#include "base/system_monitor/system_monitor.h"
+#include "jni/SystemMonitor_jni.h"
namespace base {
+namespace android {
+
+// Native implementation of SystemMonitor.java.
+void OnBatteryChargingChanged(JNIEnv* env,
+ jclass clazz) {
+ SystemMonitor::Get()->ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
+}
+
+} // namespace android
+
bool SystemMonitor::IsBatteryPower() {
- NOTIMPLEMENTED();
- return true;
+ JNIEnv* env = base::android::AttachCurrentThread();
+ return base::android::Java_SystemMonitor_isBatteryPower(env);
+}
+
+bool SystemMonitor::RegisterSystemMonitor(JNIEnv* env) {
vandebo (ex-Chrome) 2012/10/04 19:19:22 nit: // static
bulach 2012/10/05 13:12:30 Done.
+ return base::android::RegisterNativesImpl(env);
}
} // namespace base

Powered by Google App Engine
This is Rietveld 408576698