New statusbar images for ChromeOS

chrome/browser/chromeos/status/power_menu_button.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton
 
 // static
-const int PowerMenuButton::kNumPowerImages = 12;
+const int PowerMenuButton::kNumPowerImages = 16;
 
 PowerMenuButton::PowerMenuButton()
     : StatusAreaButton(this),
       battery_is_present_(false),
       line_power_on_(false),
       battery_fully_charged_(false),
       battery_percentage_(0.0),
       icon_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(power_menu_(this)) {
   UpdateIconAndLabelInfo();
@@ skipping 69 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, PowerLibrary::Observer implementation:
 
 void PowerMenuButton::PowerChanged(PowerLibrary* obj) {
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, StatusAreaButton implementation:
 
-void PowerMenuButton::DrawPressed(gfx::Canvas* canvas) {
-  DrawPowerIcon(canvas, *ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_STATUSBAR_BATTERY_PRESSED));
-}
-
-void PowerMenuButton::DrawIcon(gfx::Canvas* canvas) {
-  DrawPowerIcon(canvas, icon());
-}
-
-void PowerMenuButton::DrawPowerIcon(gfx::Canvas* canvas, SkBitmap icon) {
-  // Draw the battery icon 5 pixels down to center it.
-  static const int kIconVerticalPadding = 5;
-  canvas->DrawBitmapInt(icon, 0, kIconVerticalPadding);
-}
-
 void PowerMenuButton::UpdateIconAndLabelInfo() {
   PowerLibrary* cros = CrosLibrary::Get()->GetPowerLibrary();
   if (!cros)
     return;
 
   bool cros_loaded = CrosLibrary::Get()->EnsureLoaded();
   if (cros_loaded) {
     battery_is_present_ = cros->battery_is_present();
     line_power_on_ = cros->line_power_on();
     battery_fully_charged_ = cros->battery_fully_charged();
@@ skipping 23 matching lines @@
       IDR_STATUSBAR_BATTERY_CHARGING_3,
       IDR_STATUSBAR_BATTERY_CHARGING_4,
       IDR_STATUSBAR_BATTERY_CHARGING_5,
       IDR_STATUSBAR_BATTERY_CHARGING_6,
       IDR_STATUSBAR_BATTERY_CHARGING_7,
       IDR_STATUSBAR_BATTERY_CHARGING_8,
       IDR_STATUSBAR_BATTERY_CHARGING_9,
       IDR_STATUSBAR_BATTERY_CHARGING_10,
       IDR_STATUSBAR_BATTERY_CHARGING_11,
       IDR_STATUSBAR_BATTERY_CHARGING_12,
+      IDR_STATUSBAR_BATTERY_CHARGING_13,
+      IDR_STATUSBAR_BATTERY_CHARGING_14,
+      IDR_STATUSBAR_BATTERY_CHARGING_15,
+      IDR_STATUSBAR_BATTERY_CHARGING_16,
     };
     static const int kDischargingImages[kNumPowerImages] = {
       IDR_STATUSBAR_BATTERY_DISCHARGING_1,
       IDR_STATUSBAR_BATTERY_DISCHARGING_2,
       IDR_STATUSBAR_BATTERY_DISCHARGING_3,
       IDR_STATUSBAR_BATTERY_DISCHARGING_4,
       IDR_STATUSBAR_BATTERY_DISCHARGING_5,
       IDR_STATUSBAR_BATTERY_DISCHARGING_6,
       IDR_STATUSBAR_BATTERY_DISCHARGING_7,
       IDR_STATUSBAR_BATTERY_DISCHARGING_8,
       IDR_STATUSBAR_BATTERY_DISCHARGING_9,
       IDR_STATUSBAR_BATTERY_DISCHARGING_10,
       IDR_STATUSBAR_BATTERY_DISCHARGING_11,
       IDR_STATUSBAR_BATTERY_DISCHARGING_12,
+      IDR_STATUSBAR_BATTERY_DISCHARGING_13,
+      IDR_STATUSBAR_BATTERY_DISCHARGING_14,
+      IDR_STATUSBAR_BATTERY_DISCHARGING_15,
+      IDR_STATUSBAR_BATTERY_DISCHARGING_16,
     };
 
     int index = static_cast<int>(battery_percentage_ / 100.0 *
                 nextafter(static_cast<float>(kNumPowerImages), 0));
     index = std::max(std::min(index, kNumPowerImages - 1), 0);
     icon_id_ = line_power_on_ ?
         kChargingImages[index] : kDischargingImages[index];
   }
 
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(icon_id_));
   SetTooltipText(UTF16ToWide(GetLabelAt(0)));
   SchedulePaint();
 }
 
 }  // namespace chromeos