Make power button in status view invisible until we are sure battery is supported on device.

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 98 matching lines @@
   } else {
     battery_index = static_cast<int> (
         battery_percentage / 100.0 *
         nextafter(static_cast<double>(kNumPowerImages - 1), 0));
     battery_index =
         std::max(std::min(battery_index, kNumPowerImages - 2), 0);
   }
   return GetImage(size, type, battery_index);
 }
 
-SkBitmap GetMissingImage(ImageSize size) {
-  return GetImage(size, DISCHARGING, kNumPowerImages);
-}
-
 SkBitmap GetUnknownImage(ImageSize size) {
   return GetImage(size, CHARGING, kNumPowerImages);
 }
 
 class BatteryIconView : public views::View {
  public:
   BatteryIconView()
       : battery_percentage_(0),
         battery_is_present_(false),
         line_power_on_(false),
@@ skipping 17 matching lines @@
   }
 
   void set_line_power_on(bool line_power_on) {
     line_power_on_ = line_power_on;
     SchedulePaint();
   }
 
  protected:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     SkBitmap image;
-    if (!battery_is_present_) {
-      image = GetMissingImage(LARGE);
-    } else {
+    if (battery_is_present_) {
       image = GetImageWithPercentage(LARGE,
                                      line_power_on_ ? CHARGING : DISCHARGING,
                                      battery_percentage_);
+    } else {
+      NOTREACHED();
+      return;
     }
     const int image_x = 0;
     const int image_y = (height() - image.height()) / 2;
     canvas->DrawBitmapInt(image, image_x, image_y);
 
     if (battery_is_present_ && (battery_percentage_ < 100 || !line_power_on_)) {
       const string16 text = UTF8ToUTF16(base::StringPrintf(
           "%d%%", static_cast<int>(battery_percentage_)));
       const int text_h = percentage_font_.GetHeight();
       const int text_y = ((height() - text_h) / 2);
@@ skipping 138 matching lines @@
   UpdateIconAndLabelInfo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, StatusAreaButton implementation:
 
 void PowerMenuButton::UpdateIconAndLabelInfo() {
   battery_is_present_ = power_status_.battery_is_present;
   line_power_on_ = power_status_.line_power_on;
 
+  bool should_be_visible = battery_is_present_;
+  if (should_be_visible != IsVisible())
+    SetVisible(should_be_visible);
+
+  if (!should_be_visible)
+    return;
+
   // If fully charged, always show 100% even if internal number is a bit less.
   if (power_status_.battery_is_full)
     battery_percentage_ = 100.0;
   else
     battery_percentage_ = power_status_.battery_percentage;
 
   UpdateBatteryTime(&battery_time_to_full_,
                     TimeDelta::FromSeconds(
                         power_status_.battery_seconds_to_full));
   UpdateBatteryTime(&battery_time_to_empty_,
                     TimeDelta::FromSeconds(
                         power_status_.battery_seconds_to_empty));
 
-  string16 tooltip_text;
-  if (!battery_is_present_) {
-    SetIcon(GetMissingImage(SMALL));
-    tooltip_text = l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_BATTERY);

[DaveMoore, 2011/11/16 23:35:27]

Please remove the string too

-  } else {
-    SetIcon(GetImageWithPercentage(
-        SMALL, line_power_on_ ? CHARGING : DISCHARGING, battery_percentage_));
-    const int message_id = line_power_on_ ?
-        IDS_STATUSBAR_BATTERY_CHARGING_PERCENTAGE :
-        IDS_STATUSBAR_BATTERY_USING_PERCENTAGE;
-    tooltip_text =  l10n_util::GetStringFUTF16(
-        message_id, base::IntToString16(static_cast<int>(battery_percentage_)));
-  }
+  SetIcon(GetImageWithPercentage(
+      SMALL, line_power_on_ ? CHARGING : DISCHARGING, battery_percentage_));
+  const int message_id = line_power_on_ ?
+      IDS_STATUSBAR_BATTERY_CHARGING_PERCENTAGE :
+      IDS_STATUSBAR_BATTERY_USING_PERCENTAGE;
+  string16 tooltip_text =  l10n_util::GetStringFUTF16(
+       message_id, base::IntToString16(static_cast<int>(battery_percentage_)));
   SetTooltipText(tooltip_text);
   SetAccessibleName(tooltip_text);
   SchedulePaint();
   UpdateStatusView();
 }
 
 void PowerMenuButton::UpdateStatusView() {
   if (status_) {
     string16 charging_text;
     if (battery_is_present_) {
@@ skipping 20 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