chromeos: Simplify power supply info in PowerLibrary

chrome/browser/chromeos/status/power_menu_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
 #pragma once
 
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
+#include "third_party/cros/chromeos_power.h"

[stevenjb, 2011/10/18 23:08:23]

We shouldn't use the PowerStatus struct defined in libcros; that should be going
away. We should define a struct in Chrome instead.

[Simon Que, 2011/10/18 23:17:28]

Agreed, but I was hoping to do it after this patch and the other one:
http://codereview.chromium.org/8347016/

 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
 namespace base {
 class TimeDelta;
 }
 
 namespace views {
 class MenuRunner;
 }
@@ skipping 10 matching lines @@
                         public PowerLibrary::Observer {
  public:
   explicit PowerMenuButton(StatusAreaHost* host);
   virtual ~PowerMenuButton();
 
   // views::MenuDelegate implementation.
   virtual string16 GetLabel(int id) const;
   virtual bool IsCommandEnabled(int id) const;
 
   // PowerLibrary::Observer implementation.
-  virtual void PowerChanged(PowerLibrary* obj);
+  virtual void PowerChanged(const PowerStatus& power_status);
   virtual void SystemResumed() {}
 
   int battery_index() const { return battery_index_; }
 
  protected:
   virtual int icon_width();
 
  private:
   class StatusView;
 
@@ skipping 12 matching lines @@
   // Update Battery time. Try to make it monotonically decreasing unless
   // there's a large delta.
   void UpdateBatteryTime(base::TimeDelta* previous,
                          const base::TimeDelta& current);
 
   // Stored data gathered from CrosLibrary::PowerLibrary.
   bool battery_is_present_;
   bool line_power_on_;
   double battery_percentage_;
   int battery_index_;
+  PowerStatus power_status_;
+
   base::TimeDelta battery_time_to_full_;
   base::TimeDelta battery_time_to_empty_;
 
   // The currently showing status view. NULL if menu is not being displayed.
   StatusView* status_;
 
   // If non-null the menu is showing.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerMenuButton);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_