ash: Improve low-battery notification thresholds.

ash/system/chromeos/power/tray_power.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/tray_power.h"
 
 #include "ash/ash_switches.h"
 #include "ash/system/chromeos/power/power_status_view.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/system_notifier.h"
@@ skipping 16 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using message_center::MessageCenter;
 using message_center::Notification;
 
 namespace ash {
 namespace internal {
-
-namespace {
-// Notification times.
-const int kCriticalSeconds = 5 * 60;
-const int kLowPowerSeconds = 15 * 60;
-const int kNoWarningSeconds = 30 * 60;
-// Notification in battery percentage.
-const double kCriticalPercentage = 5.0;
-const double kLowPowerPercentage = 10.0;
-const double kNoWarningPercentage = 15.0;
-
-}  // namespace
-
 namespace tray {
 
 // This view is used only for the tray.
 class PowerTrayView : public views::ImageView {
  public:
   PowerTrayView() {
     UpdateImage();
   }
 
   virtual ~PowerTrayView() {
@@ skipping 41 matching lines @@
  private:
   PowerStatusView* power_status_view_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerNotificationView);
 };
 
 }  // namespace tray
 
 using tray::PowerNotificationView;
 
+const int TrayPower::kCriticalMinutes = 5;
+const int TrayPower::kLowPowerMinutes = 15;
+const int TrayPower::kNoWarningMinutes = 30;
+const int TrayPower::kCriticalPercentage = 5;
+const int TrayPower::kLowPowerPercentage = 10;
+const int TrayPower::kNoWarningPercentage = 15;
+
 TrayPower::TrayPower(SystemTray* system_tray, MessageCenter* message_center)
     : SystemTrayItem(system_tray),
       message_center_(message_center),
       power_tray_(NULL),
       notification_view_(NULL),
       notification_state_(NOTIFICATION_NONE),
       usb_charger_was_connected_(false) {
   PowerStatus::Get()->AddObserver(this);
 }
 
@@ skipping 107 matching lines @@
     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   return status.IsUsbChargerConnected() ?
       UpdateNotificationStateForRemainingPercentage() :
       UpdateNotificationStateForRemainingTime();
 }
 
 bool TrayPower::UpdateNotificationStateForRemainingTime() {
-  const int remaining_seconds =
-      PowerStatus::Get()->GetBatteryTimeToEmpty().InSeconds();
+  // The notification includes a rounded minutes value, so round the estimate
+  // received from the power manager to match.
+  const int remaining_minutes = static_cast<int>(
+      PowerStatus::Get()->GetBatteryTimeToEmpty().InSecondsF() / 60.0 + 0.5);
 
-  if (remaining_seconds >= kNoWarningSeconds) {
+  if (remaining_minutes >= kNoWarningMinutes) {
     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   switch (notification_state_) {
     case NOTIFICATION_NONE:
-      if (remaining_seconds <= kCriticalSeconds) {
+      if (remaining_minutes <= kCriticalMinutes) {
         notification_state_ = NOTIFICATION_CRITICAL;
         return true;
       }
-      if (remaining_seconds <= kLowPowerSeconds) {
+      if (remaining_minutes <= kLowPowerMinutes) {
         notification_state_ = NOTIFICATION_LOW_POWER;
         return true;
       }
       return false;
     case NOTIFICATION_LOW_POWER:
-      if (remaining_seconds <= kCriticalSeconds) {
+      if (remaining_minutes <= kCriticalMinutes) {
         notification_state_ = NOTIFICATION_CRITICAL;
         return true;
       }
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 bool TrayPower::UpdateNotificationStateForRemainingPercentage() {
-  const double remaining_percentage = PowerStatus::Get()->GetBatteryPercent();
+  // The notification includes a rounded percentage, so round the value received
+  // from the power manager to match.
+  const int remaining_percentage =
+      PowerStatus::Get()->GetRoundedBatteryPercent();
 
-  if (remaining_percentage > kNoWarningPercentage) {
+  if (remaining_percentage >= kNoWarningPercentage) {
     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   switch (notification_state_) {
     case NOTIFICATION_NONE:
       if (remaining_percentage <= kCriticalPercentage) {
         notification_state_ = NOTIFICATION_CRITICAL;
         return true;
       }
@@ skipping 10 matching lines @@
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash