Merge 110560 - Make power button in status view invisible until we are sure battery is supported ...

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"
@@ skipping 88 matching lines @@
           static_cast<int>(type) * image_width,
           index * image_height,
           image_width,
           image_height);
 
   SkBitmap image;
   all_images->extractSubset(&image, subset);
   return image;
 }
 
-SkBitmap GetMissingImage(ImageSize size) {
-  return GetImage(size, DISCHARGING, kNumPowerImages);
-}
-
 SkBitmap GetUnknownImage(ImageSize size) {
   return GetImage(size, CHARGING, kNumPowerImages);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 using base::TimeDelta;
 
@@ skipping 32 matching lines @@
     // Force a paint even if the size didn't change.
     SchedulePaint();
   }
 
  protected:
   void OnPaint(gfx::Canvas* canvas) {
     SkBitmap image;
 
     bool draw_percentage_text = false;
     bool battery_is_present = menu_button_->battery_is_present_;
-    if (!battery_is_present) {
-      image = GetMissingImage(LARGE);
-    } else {
+    if (battery_is_present) {
       image = GetImage(
           LARGE,
           menu_button_->line_power_on_ ? CHARGING : DISCHARGING,
           menu_button_->battery_index_);
       if (menu_button_->battery_percentage_ < 100 ||
           !menu_button_->line_power_on_) {
         draw_percentage_text = true;
       }
+    } else {
+      NOTREACHED();
+      return;
     }
     int image_x = kPadLeftX, image_y = (height() - image.height()) / 2;
     canvas->DrawBitmapInt(image, image_x, image_y);
 
     if (draw_percentage_text) {
       string16 text = UTF8ToUTF16(base::StringPrintf(
           "%d%%",
           static_cast<int>(menu_button_->battery_percentage_)));
       int text_h = percentage_font_.GetHeight();
       int text_y = ((height() - text_h) / 2);
@@ skipping 170 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, StatusAreaButton implementation:
 
 void PowerMenuButton::UpdateIconAndLabelInfo() {
   PowerLibrary* power_lib = CrosLibrary::Get()->GetPowerLibrary();
 
   battery_is_present_ = power_lib->IsBatteryPresent();
   line_power_on_ = power_lib->IsLinePowerOn();
 
+  bool should_be_visible = battery_is_present_;
+  if (should_be_visible != IsVisible())
+    SetVisible(should_be_visible);
+
+  if (!should_be_visible) {
+    battery_index_ = -1;
+    return;
+  }
+
   // 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();
     battery_percentage_ = 100.0;
   } else {
     battery_percentage_ = power_lib->GetBatteryPercentage();
   }
 
   UpdateBatteryTime(&battery_time_to_full_, power_lib->GetBatteryTimeToFull());
   UpdateBatteryTime(&battery_time_to_empty_,
                     power_lib->GetBatteryTimeToEmpty());
 
-  string16 tooltip_text;
-  if (!battery_is_present_) {
-    battery_index_ = -1;
-    SetIcon(GetMissingImage(SMALL));
-    tooltip_text = l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_BATTERY);
+  // Preserve the fully charged icon for 100% only.
+  if (battery_percentage_ >= 100) {
+    battery_index_ = kNumPowerImages - 1;
   } else {
-    // Preserve the fully charged icon for 100% only.
-    if (battery_percentage_ >= 100) {
-      battery_index_ = kNumPowerImages - 1;
-    } else {
-      battery_index_ =
+     battery_index_ =
           static_cast<int>(battery_percentage_ / 100.0 *
-              nextafter(static_cast<float>(kNumPowerImages - 1), 0));
-      battery_index_ =
-          std::max(std::min(battery_index_, kNumPowerImages - 2), 0);
-    }
-    SetIcon(GetImage(
-        SMALL, line_power_on_ ? CHARGING : DISCHARGING, battery_index_));
+            nextafter(static_cast<float>(kNumPowerImages - 1), 0));
+    battery_index_ =
+        std::max(std::min(battery_index_, kNumPowerImages - 2), 0);
+  }
+  SetIcon(GetImage(
+      SMALL, line_power_on_ ? CHARGING : DISCHARGING, battery_index_));
 
-    tooltip_text =  l10n_util::GetStringFUTF16(
+  string16 tooltip_text =  l10n_util::GetStringFUTF16(
         IDS_STATUSBAR_BATTERY_PERCENTAGE,
         base::IntToString16(static_cast<int>(battery_percentage_)));
-  }
   SetTooltipText(tooltip_text);
   SetAccessibleName(tooltip_text);
   SchedulePaint();
   if (status_)
     status_->Update();
 }
 
 void PowerMenuButton::UpdateBatteryTime(TimeDelta* previous,
                                         const TimeDelta& current) {
   static const TimeDelta kMaxDiff(TimeDelta::FromMinutes(10));
   static const TimeDelta kMinDiff(TimeDelta::FromMinutes(0));
   const TimeDelta diff = current - *previous;
   // If the diff is small and positive, ignore it in favor of
   // keeping time monotonically decreasing.
   // 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