chromeos: Simplify power supply info in PowerLibrary

chrome/browser/chromeos/status/power_menu_button.cc

 // 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.
 
 #include "chrome/browser/chromeos/status/power_menu_button.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/cros/chromeos_power.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
@@ skipping 316 matching lines @@
           views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
   status_ = NULL;
   menu_runner_.reset(NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, PowerLibrary::Observer implementation:
 
-void PowerMenuButton::PowerChanged(PowerLibrary* obj) {
+void PowerMenuButton::PowerChanged(const PowerStatus& power_status) {
+  power_status_ = power_status;
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, StatusAreaButton implementation:
 
 void PowerMenuButton::UpdateIconAndLabelInfo() {
-  PowerLibrary* power_lib = CrosLibrary::Get()->GetPowerLibrary();
-
-  battery_is_present_ = power_lib->IsBatteryPresent();
-  line_power_on_ = power_lib->IsLinePowerOn();
+  battery_is_present_ = power_status_.battery_is_present;
+  line_power_on_ = power_status_.line_power_on;
 
   // If fully charged, always show 100% even if internal number is a bit less.
-  if (power_lib->IsBatteryFullyCharged()) {
-    // We always call power_lib->GetBatteryPercentage() for test predictability.
-    power_lib->GetBatteryPercentage();
+  if (power_status_.battery_state == chromeos::BATTERY_STATE_FULLY_CHARGED)
     battery_percentage_ = 100.0;
-  } else {
-    battery_percentage_ = power_lib->GetBatteryPercentage();
-  }
+  else
+    battery_percentage_ = power_status_.battery_percentage;
 
-  UpdateBatteryTime(&battery_time_to_full_, power_lib->GetBatteryTimeToFull());
+  UpdateBatteryTime(&battery_time_to_full_,
+                    TimeDelta::FromSeconds(power_status_.battery_time_to_full));
   UpdateBatteryTime(&battery_time_to_empty_,
-                    power_lib->GetBatteryTimeToEmpty());
+                    TimeDelta::FromSeconds(
+                        power_status_.battery_time_to_empty));
 
   string16 tooltip_text;
   if (!battery_is_present_) {
     battery_index_ = -1;
     SetIcon(GetMissingImage(SMALL));
     tooltip_text = l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_BATTERY);
   } else {
     // Preserve the fully charged icon for 100% only.
     if (battery_percentage_ >= 100) {
       battery_index_ = kNumPowerImages - 1;
@@ skipping 28 matching lines @@
   // If previous is 0, then it either was never set (initial condition)
   // or got down to 0.
   if (*previous == TimeDelta::FromMicroseconds(kInitialMS) ||
       diff < kMinDiff ||
       diff > kMaxDiff) {
     *previous = current;
   }
 }
 
 }  // namespace chromeos