Battery Status API: add plumbing for multi-platform support.

content/browser/battery_status/battery_status_manager.h

Index: content/browser/battery_status/battery_status_manager.h
diff --git a/content/browser/battery_status/battery_status_manager_android.h b/content/browser/battery_status/battery_status_manager.h
similarity index 50%
rename from content/browser/battery_status/battery_status_manager_android.h
rename to content/browser/battery_status/battery_status_manager.h
index 04746de61b1f1cb20c5c938a0c38c32ab4972b26..8d2fabf8f7c40ef8a541749458a1dd4f3361b83b 100644
--- a/content/browser/battery_status/battery_status_manager_android.h
+++ b/content/browser/battery_status/battery_status_manager.h
@@ -2,17 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
-#define CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
+#ifndef CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_H_
+#define CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_H_
 
+#include "build/build_config.h"
+
+#if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
+#endif
+
+#include "content/browser/battery_status/battery_status_update_callback.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
-// Android implementation of Battery Status API.
-class CONTENT_EXPORT BatteryStatusManagerAndroid {
+// Platform specific manager class for fetching battery status data.
+class CONTENT_EXPORT BatteryStatusManager {
  public:
+  explicit BatteryStatusManager(const BatteryStatusUpdateCallback& callback);
+  virtual ~BatteryStatusManager();
+
+  // Start listening for battery status changes. New updates are signalled
+  // by invoking the callback provided at construction time.
+  bool StartListeningBatteryChange();
+
+  // Stop listenting for battery status changes.
+  void StopListeningBatteryChange();
+
+#if defined(OS_ANDROID)
   // Must be called at startup.
   static bool Register(JNIEnv* env);
 
@@ -20,21 +37,18 @@ class CONTENT_EXPORT BatteryStatusManagerAndroid {
   void GotBatteryStatus(JNIEnv*, jobject, jboolean charging,
                         jdouble chargingTime, jdouble dischargingTime,

[bulach, 2014/05/07 16:03:15]

nit: sorry, while at it: s/gTime/g_time/

[timvolodine, 2014/05/09 15:23:49]

Done.

                         jdouble level);
-
-  bool StartListeningBatteryChange();
-  void StopListeningBatteryChange();
-
- protected:
-  BatteryStatusManagerAndroid();
-  virtual ~BatteryStatusManagerAndroid();
+#endif
 
  private:
+#if defined(OS_ANDROID)
   // Java provider of battery status info.
   base::android::ScopedJavaGlobalRef<jobject> j_manager_;
+#endif
+  BatteryStatusUpdateCallback callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerAndroid);
+  DISALLOW_COPY_AND_ASSIGN(BatteryStatusManager);
 };
 
 }  // namespace content
 
-#endif  // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
+#endif  // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_H_