Battery Status API: browser-side implementation.

content/browser/battery_status/battery_status_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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_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"
+#include "content/browser/battery_status/battery_status_service.h"
 
 namespace content {
 
 // Platform specific manager class for fetching battery status data.
-class CONTENT_EXPORT BatteryStatusManager {
+class BatteryStatusManager {
  public:
-  explicit BatteryStatusManager(const BatteryStatusUpdateCallback& callback);
-  virtual ~BatteryStatusManager();
+  explicit BatteryStatusManager(
+      const BatteryStatusService::BatteryUpdateCallback& callback);
+  virtual ~BatteryStatusManager() { }

[jochen (gone - plz use gerrit), 2014/05/23 08:13:36]

please keep non-trivial dtors in the .cc file (it'll destruct the scoped java
global ref)

[timvolodine, 2014/05/27 12:32:05]

Done.

+
+  // Methods from BatteryStatusManagerInterface.

[Michael van Ouwerkerk, 2014/05/22 10:36:52]

Nit: does this comment still apply?

[timvolodine, 2014/05/27 12:32:05]

Done.

 
   // Start listening for battery status changes. New updates are signalled
   // by invoking the callback provided at construction time.
-  bool StartListeningBatteryChange();
+  virtual bool StartListeningBatteryChange();
 
-  // Stop listenting for battery status changes.
-  void StopListeningBatteryChange();
+  // 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
-  BatteryStatusUpdateCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BatteryStatusManager);
 };
 
 }  // namespace content
 
 #endif  // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_H_