REVERTED cros: Update charging not reliable battery status

ash/system/chromeos/power/power_status_view.cc

 // Copyright (c) 2012 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 "ash/system/chromeos/power/power_status_view.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/power/tray_power.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
@@ skipping 14 matching lines @@
 namespace {
 
 // Top/bottom padding of the text items.
 const int kPaddingVertical = 10;
 // Specify min width of status label for layout.
 const int kLabelMinWidth = 120;
 // Padding between battery status text and battery icon on default view.
 const int kPaddingBetweenBatteryStatusAndIcon = 3;
 // Minimum battery percentage rendered in UI.
 const int kMinBatteryPercent = 1;
+
+base::string16 GetChargingUnreliableString() {
+  // String is intentionally hard-coded in English for backport to M28 only.
+  // See crbug.com/246336 for details.
+  return UTF8ToUTF16("Low-power charger");
+}
+
 }  // namespace
 
 PowerStatusView::PowerStatusView(ViewType view_type,
                                  bool default_view_right_align)
     : default_view_right_align_(default_view_right_align),
       status_label_(NULL),
       time_label_(NULL),
       time_status_label_(NULL),
       percentage_label_(NULL),
       icon_(NULL),
@@ skipping 72 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   base::string16 battery_percentage;
   base::string16 battery_time_status;
   bool is_charging_unreliable =
       TrayPower::IsBatteryChargingUnreliable(supply_status_);
   if (supply_status_.line_power_on && supply_status_.battery_is_full) {
     battery_time_status =
         rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_FULL);
   } else if (supply_status_.battery_percentage < 0.0f) {
     battery_time_status =
-        is_charging_unreliable ?
-        rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE) :
-        rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);
+        is_charging_unreliable
+            ? GetChargingUnreliableString()

[Daniel Erat, 2013/06/04 19:23:15]

this style seems strange to me -- i think that i've usually seen the '?' and ':'
go on the ends of the previous lines. the push seems to be to cram everything
onto fewer lines, too, so i'd recommend the following:

  battery_time_status = is_charging_unreliable ?
      GetChargingUnreliableString() :
      rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);

+            : rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);
   } else {
     battery_percentage = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_ONLY,
         base::IntToString16(TrayPower::GetRoundedBatteryPercentage(
             supply_status_.battery_percentage)));
     if (is_charging_unreliable) {
-      battery_time_status = rb.GetLocalizedString(
-          IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE);
+      battery_time_status = GetChargingUnreliableString();
     } else {
       if (supply_status_.is_calculating_battery_time) {
         battery_time_status =
             rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);
       } else {
         base::TimeDelta time = base::TimeDelta::FromSeconds(
             supply_status_.line_power_on ?
             supply_status_.battery_seconds_to_full :
             supply_status_.battery_seconds_to_empty);
         int hour = time.InHours();
@@ skipping 52 matching lines @@
     } else {
       status_label_->SetText(
           l10n_util::GetStringFUTF16(
               IDS_ASH_STATUS_TRAY_BATTERY_PERCENT,
               base::IntToString16(TrayPower::GetRoundedBatteryPercentage(
                   supply_status_.battery_percentage))));
     }
   }
 
   if (is_charging_unreliable) {
-    time_label_->SetText(
-        ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
-            IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE));
+    time_label_->SetText(GetChargingUnreliableString());
   } else if (supply_status_.is_calculating_battery_time) {
     time_label_->SetText(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING));
   } else if (hour || min) {
     if (supply_status_.line_power_on) {
       time_label_->SetText(
           l10n_util::GetStringFUTF16(
               IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL,
               base::IntToString16(hour),
@@ skipping 81 matching lines @@
 
   // Move the time_status_label_ closer to percentage_label_.
   if (percentage_label_ && time_status_label_ &&
       percentage_label_->visible() && time_status_label_->visible()) {
     time_status_label_->SetX(percentage_label_->bounds().right() + 1);
   }
 }
 
 }  // namespace internal
 }  // namespace ash