Merge 240486 "Implement the spring charger replacement UI and ad..."

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/shell.h"
 #include "ash/system/chromeos/power/power_status_view.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/system_notifier.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/command_line.h"
+#include "base/metrics/histogram.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/icu/source/i18n/unicode/fieldpos.h"
 #include "third_party/icu/source/i18n/unicode/fmtable.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 86 matching lines @@
 }  // namespace tray
 
 using tray::PowerNotificationView;
 
 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) {
+      usb_charger_was_connected_(false),
+      line_power_was_connected_(false) {
   PowerStatus::Get()->AddObserver(this);
 }
 
 TrayPower::~TrayPower() {
   PowerStatus::Get()->RemoveObserver(this);
 }
 
 views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
   // There may not be enough information when this is created about whether
   // there is a battery or not. So always create this, and adjust visibility as
@@ skipping 33 matching lines @@
 }
 
 void TrayPower::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayPower::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayImageItemBorder(power_tray_, alignment);
 }
 
 void TrayPower::OnPowerStatusChanged() {
+  RecordChargerType();
+
+  if (PowerStatus::Get()->IsOriginalSpringChargerConnected()) {
+    ash::Shell::GetInstance()->system_tray_delegate()->
+        ShowSpringChargerReplacementDialog();
+  }
+
   bool battery_alert = UpdateNotificationState();
   if (power_tray_)
     power_tray_->UpdateStatus(battery_alert);
   if (notification_view_)
     notification_view_->UpdateStatus();
 
   // Factory testing may place the battery into unusual states.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kAshHideNotificationsForFactory))
     return;
 
   if (ash::switches::UseUsbChargerNotification())
     MaybeShowUsbChargerNotification();
 
   if (battery_alert)
     ShowNotificationView();
   else if (notification_state_ == NOTIFICATION_NONE)
     HideNotificationView();
 
   usb_charger_was_connected_ = PowerStatus::Get()->IsUsbChargerConnected();
+  line_power_was_connected_ = PowerStatus::Get()->IsLinePowerConnected();
 }
 
 bool TrayPower::MaybeShowUsbChargerNotification() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const char kNotificationId[] = "usb-charger";
   bool usb_charger_is_connected = PowerStatus::Get()->IsUsbChargerConnected();
 
   // Check for a USB charger being connected.
   if (usb_charger_is_connected && !usb_charger_was_connected_) {
     scoped_ptr<Notification> notification(new Notification(
@@ skipping 92 matching lines @@
         return true;
       }
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
+void TrayPower::RecordChargerType() {
+  if (!PowerStatus::Get()->IsLinePowerConnected() ||
+      line_power_was_connected_)
+    return;
+
+  ChargerType current_charger = UNKNOWN_CHARGER;
+  if (PowerStatus::Get()->IsMainsChargerConnected()) {
+    current_charger = MAINS_CHARGER;
+  } else if (PowerStatus::Get()->IsUsbChargerConnected()) {
+    current_charger = USB_CHARGER;
+  } else if (PowerStatus::Get()->IsOriginalSpringChargerConnected()) {
+    current_charger =
+        ash::Shell::GetInstance()->system_tray_delegate()->
+            HasUserConfirmedSafeSpringCharger() ?
+        SAFE_SPRING_CHARGER : UNCONFIRMED_SPRING_CHARGER;
+  }
+
+  if (current_charger != UNKNOWN_CHARGER) {
+    UMA_HISTOGRAM_ENUMERATION("Power.ChargerType",
+                              current_charger,
+                              CHARGER_TYPE_COUNT);
+  }
+}
+
 }  // namespace internal
 }  // namespace ash