Chromium Code Reviews| Index: content/browser/battery_status/battery_status_manager.h |
| diff --git a/content/browser/battery_status/battery_status_manager.h b/content/browser/battery_status/battery_status_manager.h |
| index 20e71edfbb117f92e4734de417b3d07337e3e3cf..4fe83005844ade0becdd2d44d7cf2bf4083b4307 100644 |
| --- a/content/browser/battery_status/battery_status_manager.h |
| +++ b/content/browser/battery_status/battery_status_manager.h |
| @@ -6,11 +6,6 @@ |
| #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_service.h" |
| namespace content { |
| @@ -18,38 +13,22 @@ namespace content { |
| // Platform specific manager class for fetching battery status data. |
| class CONTENT_EXPORT BatteryStatusManager { |
| public: |
| - explicit BatteryStatusManager( |
| + // Creates a BatteryStatusManager object. |callback| should be called when the |
| + // battery status changes. |
| + // Note that |callback| should be called in the UI thread. |
|
timvolodine
2014/07/02 19:41:39
I don't think we should force implementations to i
sadrul
2014/07/04 16:58:18
Removed.
|
| + static BatteryStatusManager* Create( |
| const BatteryStatusService::BatteryUpdateCallback& callback); |
| - virtual ~BatteryStatusManager(); |
| + |
| + virtual ~BatteryStatusManager() {} |
| // Start listening for battery status changes. New updates are signalled |
| // by invoking the callback provided at construction time. |
| - virtual bool StartListeningBatteryChange(); |
| + // Note that this is called in the IO thread. |
| + virtual bool StartListeningBatteryChange() = 0; |
| // Stop listening for battery status changes. |
| - virtual void StopListeningBatteryChange(); |
| - |
| -#if defined(OS_ANDROID) |
| - // Must be called at startup. |
| - static bool Register(JNIEnv* env); |
| - |
| - // Called from Java via JNI. |
| - void GotBatteryStatus(JNIEnv*, jobject, jboolean charging, |
| - jdouble charging_time, jdouble discharging_time, |
| - jdouble level); |
| -#endif |
| - |
| - protected: |
| - BatteryStatusManager(); |
| - BatteryStatusService::BatteryUpdateCallback callback_; |
| - |
| - private: |
| -#if defined(OS_ANDROID) |
| - // Java provider of battery status info. |
| - base::android::ScopedJavaGlobalRef<jobject> j_manager_; |
| -#endif |
| - |
| - DISALLOW_COPY_AND_ASSIGN(BatteryStatusManager); |
| + // Note that this is called in the IO thread. |
| + virtual void StopListeningBatteryChange() = 0; |
| }; |
| } // namespace content |