Remove Yoshi charger recall pop up warning UI code.

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/accessibility_delegate.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status_view.h"
@@ skipping 21 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 tray {
-namespace {
-
-const int kMaxSpringChargerAccessibilityNotifyCount = 3;
-const int kSpringChargerAccessibilityTimerFirstTimeNotifyInSeconds = 30;
-const int kSpringChargerAccessibilityTimerRepeatInMinutes = 5;
-
-}
 
 // This view is used only for the tray.
 class PowerTrayView : public views::ImageView {
  public:
-  PowerTrayView()
-      : spring_charger_spoken_notification_count_(0) {
+  PowerTrayView() {
     UpdateImage();
   }
 
   virtual ~PowerTrayView() {
   }
 
   // Overriden from views::View.
   virtual void GetAccessibleState(ui::AXViewState* state) override {
     state->name = accessible_name_;
     state->role = ui::AX_ROLE_BUTTON;
   }
 
   void UpdateStatus(bool battery_alert) {
     UpdateImage();
     SetVisible(PowerStatus::Get()->IsBatteryPresent());
 
     if (battery_alert) {
       accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true);
       NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
     }
   }
 
-  void SetupNotifyBadCharger() {
-    // Poll with a shorter duration timer to notify the charger issue
-    // for the first time after the charger dialog is displayed.
-    spring_charger_accessibility_timer_.Start(
-        FROM_HERE, base::TimeDelta::FromSeconds(
-            kSpringChargerAccessibilityTimerFirstTimeNotifyInSeconds),
-        this, &PowerTrayView::NotifyChargerIssue);
-  }
-
  private:
   void UpdateImage() {
     SetImage(PowerStatus::Get()->GetBatteryImage(PowerStatus::ICON_LIGHT));
   }
 
-  void NotifyChargerIssue() {
-    if (!Shell::GetInstance()->accessibility_delegate()->
-            IsSpokenFeedbackEnabled())
-      return;
-
-    if (!Shell::GetInstance()->system_tray_delegate()->
-            IsSpringChargerReplacementDialogVisible()) {
-      spring_charger_accessibility_timer_.Stop();
-      return;
-    }
-
-    accessible_name_ = ui::ResourceBundle::GetSharedInstance().
-        GetLocalizedString(IDS_CHARGER_REPLACEMENT_ACCESSIBILITY_NOTIFICATION);
-    NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
-    ++spring_charger_spoken_notification_count_;
-
-    if (spring_charger_spoken_notification_count_ == 1) {
-      // After notify the charger issue for the first time, repeat the
-      // notification with a longer duration timer.
-      spring_charger_accessibility_timer_.Stop();
-      spring_charger_accessibility_timer_.Start(
-          FROM_HERE, base::TimeDelta::FromMinutes(
-              kSpringChargerAccessibilityTimerRepeatInMinutes),
-          this, &PowerTrayView::NotifyChargerIssue);
-    } else if (spring_charger_spoken_notification_count_ >=
-        kMaxSpringChargerAccessibilityNotifyCount) {
-      spring_charger_accessibility_timer_.Stop();
-    }
-  }
-
   base::string16 accessible_name_;
 
-  // Tracks how many times the original spring charger accessibility
-  // notification has been spoken.
-  int spring_charger_spoken_notification_count_;
-
-  base::RepeatingTimer<PowerTrayView> spring_charger_accessibility_timer_;
-
   DISALLOW_COPY_AND_ASSIGN(PowerTrayView);
 };
 
 class PowerNotificationView : public TrayNotificationView {
  public:
   explicit PowerNotificationView(TrayPower* owner)
       : TrayNotificationView(owner, 0) {
     power_status_view_ =
         new PowerStatusView(PowerStatusView::VIEW_NOTIFICATION, true);
     InitView(power_status_view_);
@@ skipping 74 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()) {
-    if (ash::Shell::GetInstance()->system_tray_delegate()->
-            ShowSpringChargerReplacementDialog()) {
-      power_tray_->SetupNotifyBadCharger();
-    }
-  }
-
   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 (base::CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kAshHideNotificationsForFactory))
     return;
@@ skipping 39 matching lines @@
     message_center_->RemoveNotification(kNotificationId, false);
     return true;
   }
   return false;
 }
 
 bool TrayPower::UpdateNotificationState() {
   const PowerStatus& status = *PowerStatus::Get();
   if (!status.IsBatteryPresent() ||
       status.IsBatteryTimeBeingCalculated() ||
-      status.IsMainsChargerConnected() ||
-      status.IsOriginalSpringChargerConnected()) {

[Daniel Erat, 2014/11/14 22:48:26]

i think we still want to include this here, at least until powerd is updated to
report the original spring charger as a regular mains charger. (do you want me
to check in a change to do that first?)

[jennyz, 2014/11/15 00:04:04]

Yes, please check in the change for updating powerd before this cl if it does
not take too much trouble.

+      status.IsMainsChargerConnected()) {
     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   return status.IsUsbChargerConnected() ?
       UpdateNotificationStateForRemainingPercentage() :
       UpdateNotificationStateForRemainingTime();
 }
 
 bool TrayPower::UpdateNotificationStateForRemainingTime() {
@@ skipping 61 matching lines @@
         return true;
       }
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
-void TrayPower::RecordChargerType() {

[Daniel Erat, 2014/11/14 22:48:26]

it might be worthwhile to keep this metric around, but if you want to get rid of
it you should also mark it as deprecated in
tools/metrics/histograms/histograms.xml

[jennyz, 2014/11/15 00:04:04]

I deprecated it in the histograms.xml.

-  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 ash