Refactor cros library code into central location and have the UI elements obs...

chrome/browser/chromeos/power_menu_button.cc

Index: chrome/browser/chromeos/power_menu_button.cc
===================================================================
--- chrome/browser/chromeos/power_menu_button.cc	(revision 0)
+++ chrome/browser/chromeos/power_menu_button.cc	(revision 0)
@@ -0,0 +1,126 @@
+// Copyright (c) 2009 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/power_menu_button.h"
+
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "base/time.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// PowerMenuButton
+
+// static
+const int PowerMenuButton::kNumPowerImages = 8;
+
+PowerMenuButton::PowerMenuButton()
+    : MenuButton(NULL, std::wstring(), this, false),
+      ALLOW_THIS_IN_INITIALIZER_LIST(power_menu_(this)) {
+  SetShowHighlighted(false);
+  UpdateIcon();
+  CrosPowerLibrary::Get()->AddObserver(this);
+}
+
+PowerMenuButton::~PowerMenuButton() {
+  CrosPowerLibrary::Get()->RemoveObserver(this);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// PowerMenuButton, views::Menu2Model implementation:
+
+int PowerMenuButton::GetItemCount() const {
+  return 2;
+}
+
+views::Menu2Model::ItemType PowerMenuButton::GetTypeAt(int index) const {
+  return views::Menu2Model::TYPE_COMMAND;
+}
+
+string16 PowerMenuButton::GetLabelAt(int index) const {
+  CrosPowerLibrary* cros = CrosPowerLibrary::Get();
+  // The first item shows the percentage of battery left.
+  if (index == 0) {
+    // If fully charged, always show 100% even if internal number is a bit less.
+    double percent = cros->battery_fully_charged() ? 100 :
+                                                     cros->battery_percentage();
+    return l10n_util::GetStringFUTF16(IDS_STATUSBAR_BATTERY_PERCENTAGE,
+        IntToString16(static_cast<int>(percent)));
+  }
+
+  // The second item shows the battery is charged if it is.
+  if (cros->battery_fully_charged())
+    return l10n_util::GetStringUTF16(IDS_STATUSBAR_BATTERY_IS_CHARGED);
+
+  // If battery is in an intermediate charge state, we show how much time left.
+  base::TimeDelta time = cros->line_power_on() ? cros->battery_time_to_full() :
+                                                 cros->battery_time_to_empty();
+  if (time.InSeconds() == 0) {
+    // If time is 0, then that means we are still calculating how much time.
+    // Depending if line power is on, we either show a message saying that we
+    // are calculating time until full or calculating remaining time.
+    int msg = cros->line_power_on() ?
+        IDS_STATUSBAR_BATTERY_CALCULATING_TIME_UNTIL_FULL :
+        IDS_STATUSBAR_BATTERY_CALCULATING_TIME_UNTIL_EMPTY;
+    return l10n_util::GetStringUTF16(msg);
+  } else {
+    // Depending if line power is on, we either show a message saying XX:YY
+    // until full or XX:YY remaining where XX is number of hours and YY is
+    // number of minutes.
+    int msg = cros->line_power_on() ? IDS_STATUSBAR_BATTERY_TIME_UNTIL_FULL :
+                                      IDS_STATUSBAR_BATTERY_TIME_UNTIL_EMPTY;
+    int hour = time.InHours();
+    int min = (time - base::TimeDelta::FromHours(hour)).InMinutes();
+    string16 hour_str = IntToString16(hour);
+    string16 min_str = IntToString16(min);
+    // Append a "0" before the minute if it's only a single digit.
+    if (min < 10)
+      min_str = ASCIIToUTF16("0") + min_str;
+    return l10n_util::GetStringFUTF16(msg, hour_str, min_str);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// PowerMenuButton, views::ViewMenuDelegate implementation:
+
+void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt,
+                              gfx::NativeView hwnd) {
+  power_menu_.Rebuild();
+  power_menu_.UpdateStates();
+  power_menu_.RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// PowerMenuButton, CrosPowerLibrary::Observer implementation:
+
+void PowerMenuButton::PowerChanged(CrosPowerLibrary* obj) {
+  UpdateIcon();
+}
+
+void PowerMenuButton::UpdateIcon() {
+  CrosPowerLibrary* cros = CrosPowerLibrary::Get();
+  int id = IDR_STATUSBAR_BATTERY_UNKNOWN;
+  if (CrosPowerLibrary::loaded()) {
+    if (cros->battery_fully_charged()) {
+      id = IDR_STATUSBAR_BATTERY_CHARGED;
+    } else {
+      // If fully charged, always show 100% even if percentage is a bit less.
+      double percent = cros->battery_fully_charged() ? 100 :
+          cros->battery_percentage();
+      // Gets the power image depending on battery percentage. Percentage is
+      // from 0 to 100, so we need to convert that to 0 to kNumPowerImages - 1.
+      int index = floor(percent / (100.0 / kNumPowerImages));
+      // This can happen if the battery is 100% full.
+      if (index == kNumPowerImages)
+        index--;
+      if (cros->line_power_on())
+        id = IDR_STATUSBAR_BATTERY_CHARGING_1 + index;
+      else
+        id = IDR_STATUSBAR_BATTERY_DISCHARGING_1 + index;
+    }
+  }
+  SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(id));
+  SchedulePaint();
+}
Property changes on: chrome/browser/chromeos/power_menu_button.cc
___________________________________________________________________
Added: svn:eol-style
   + LF