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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/system_monitor/system_monitor.h

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
« base/android/java/src/org/chromium/base/SystemMonitor.java ('K') | « base/base.gyp ('k') | base/system_monitor/system_monitor_android.cc » ('j') | base/system_monitor/system_monitor_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/system_monitor/system_monitor.h
diff --git a/base/system_monitor/system_monitor.h b/base/system_monitor/system_monitor.h
index ea95da89ccbe9fb6635b8ae905b6415ac977ca24..b897d90ab739a6927c6efee18310666c6c062376 100644
--- a/base/system_monitor/system_monitor.h
+++ b/base/system_monitor/system_monitor.h
@@ -38,6 +38,10 @@
#include <objc/runtime.h>
#endif // OS_IOS
+#if defined(OS_ANDROID)
+#include <jni.h>
+#endif
+
namespace base {
// Class for monitoring various system-related subsystems
@@ -95,6 +99,10 @@ class BASE_EXPORT SystemMonitor {
#endif // OS_IOS
#endif // OS_MACOSX
+#if defined(OS_ANDROID)
+ static bool RegisterSystemMonitor(JNIEnv* env);
+#endif
+
// Returns information for attached removable storage.
std::vector<RemovableStorageInfo> GetAttachedRemovableStorage() const;
« base/android/java/src/org/chromium/base/SystemMonitor.java ('K') | « base/base.gyp ('k') | base/system_monitor/system_monitor_android.cc » ('j') | base/system_monitor/system_monitor_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698