cros: Add virtual dtor to PowerLibrary::Observer class.

BUG=None
TEST=None

R=stevenjb@chromium.org

Review URL: http://codereview.chromium.org/7493044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94002 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 13 deletions

diff --git a/chrome/browser/chromeos/cros/mock_power_library.h b/chrome/browser/chromeos/cros/mock_power_library.h
index 99948b6..c83bd7d 100644
--- a/chrome/browser/chromeos/cros/mock_power_library.h
+++ b/chrome/browser/chromeos/cros/mock_power_library.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_MOCK_POWER_LIBRARY_H_
 #pragma once
 
+#include "base/time.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc
index b91dd31..e321868 100644
--- a/chrome/browser/chromeos/cros/power_library.cc
+++ b/chrome/browser/chromeos/cros/power_library.cc
@@ -4,10 +4,12 @@
 
 #include "chrome/browser/chromeos/cros/power_library.h"
 
-#include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/basictypes.h"
+#include "base/observer_list.h"
+#include "base/time.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/browser/browser_thread.h"
+#include "third_party/cros/chromeos_power.h"
 #include "third_party/cros/chromeos_resume.h"
 
 namespace chromeos {
@@ -18,9 +20,8 @@ class PowerLibraryImpl : public PowerLibrary {
       : power_status_connection_(NULL),
         resume_status_connection_(NULL),
         status_(chromeos::PowerStatus()) {
-    if (CrosLibrary::Get()->EnsureLoaded()) {
+    if (CrosLibrary::Get()->EnsureLoaded())
       Init();
-    }
   }
 
   ~PowerLibraryImpl() {
@@ -96,7 +97,7 @@ class PowerLibraryImpl : public PowerLibrary {
 
  private:
   static void PowerStatusChangedHandler(void* object,
-      const chromeos::PowerStatus& status) {
+                                        const chromeos::PowerStatus& status) {
     PowerLibraryImpl* power = static_cast<PowerLibraryImpl*>(object);
     power->UpdatePowerStatus(status);
   }
@@ -146,7 +147,7 @@ class PowerLibraryImpl : public PowerLibrary {
 
   ObserverList<Observer> observers_;
 
-  // A reference to the battery power api, to allow callbacks when the battery
+  // A reference to the power battery API, to allow callbacks when the battery
   // status changes.
   chromeos::PowerStatusConnection power_status_connection_;
 
diff --git a/chrome/browser/chromeos/cros/power_library.h b/chrome/browser/chromeos/cros/power_library.h
index 3225b36..9ed0758 100644
--- a/chrome/browser/chromeos/cros/power_library.h
+++ b/chrome/browser/chromeos/cros/power_library.h
@@ -6,10 +6,9 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
 #pragma once
 
-#include "base/memory/singleton.h"
-#include "base/observer_list.h"
-#include "base/time.h"
-#include "third_party/cros/chromeos_power.h"
+namespace base {
+class TimeDelta;
+}
 
 namespace chromeos {
 
@@ -22,17 +21,23 @@ class PowerLibrary {
    public:
     virtual void PowerChanged(PowerLibrary* obj) = 0;
     virtual void SystemResumed() = 0;
+
+   protected:
+    virtual ~Observer() {}
   };
+
   virtual ~PowerLibrary() {}
+
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
+
   // Whether or not the line power is connected.
   virtual bool line_power_on() const = 0;
 
-  // Whether or not the battery is fully charged..
+  // Whether or not the battery is fully charged.
   virtual bool battery_fully_charged() const = 0;
 
-  // The percentage (0-100) of remaining battery.
+  // The percentage [0-100] of remaining battery.
   virtual double battery_percentage() const = 0;
 
   // Whether there is a battery present.