Implement the spring charger replacement UI.

ash/system/chromeos/power/tray_power.h

Index: ash/system/chromeos/power/tray_power.h
diff --git a/ash/system/chromeos/power/tray_power.h b/ash/system/chromeos/power/tray_power.h
index 9fb65b716918a092b20bf6d372d939f32b2b6114..472b6b660fe92f5a8ebf53dd5f507a5ff33dfdc6 100644
--- a/ash/system/chromeos/power/tray_power.h
+++ b/ash/system/chromeos/power/tray_power.h
@@ -58,6 +58,15 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
  private:
   friend class TrayPowerTest;
 
+  enum ExternalPowerSupply{
+    UNKNOWN_CHARGER,
+    MAINS_CHARGER,
+    USB_CHARGER,
+    ORIGINAL_SPRING_CHARGER,

[Daniel Erat, 2013/12/10 00:08:58]

i think that the terminology here is getting confusing. i believe that you're
using "original" to describe chargers that have the original id but where the
presence of the sticker is unknown, while "safe" refers to chargers with the
original id and with a sticker. spring chargers with updated ids will use
MAINS_CHARGER instead.

at the very least, you should add comments to the enum explaining this, but i'd
suggest more-descriptive names as well. how about something like this?

UNCONFIRMED_SPRING_CHARGER
SAFE_SPRING_CHARGER

[jennyz, 2013/12/10 19:14:11]

Done.

+    SAFE_SPRING_CHARGER,
+    NUM_EXTERNAL_POWER_SUPPLY,

[xiyuan, 2013/12/10 00:21:19]

From what I learned from isherman@ on another CL, it would be better to use an
addition bucket here in case we need to add more bucket in the future. That is,
have a bucket id NUM_EXTERNAL_POWER_COUNT (which is NUM_EXTERNAL_POWER_SUPPLY +
1) here.

[jennyz, 2013/12/10 19:14:11]

The last enum value is already the count, renamed it to CHARGER_TYPE_COUNT.

+  };
+
   // Overridden from SystemTrayItem.
   virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
   virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
@@ -82,6 +91,9 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
   bool UpdateNotificationStateForRemainingTime();
   bool UpdateNotificationStateForRemainingPercentage();
 
+  // Records the external power supply type in UMA.
+  void RecordExternalPowerSupply();

[Daniel Erat, 2013/12/10 00:08:58]

nit: rename to something like RecordChargerType()?

[jennyz, 2013/12/10 19:14:11]

Done.

+
   message_center::MessageCenter* message_center_;  // Not owned.
   tray::PowerTrayView* power_tray_;
   tray::PowerNotificationView* notification_view_;
@@ -91,6 +103,8 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
   // called?
   bool usb_charger_was_connected_;
 
+  bool is_line_power_connected_;

[Daniel Erat, 2013/12/10 00:08:58]

add a comment describing what this is and match the naming style of the member
right above it, i.e. line_power_was_connected_

but it might be better to just name it something like
already_recorded_charger_type_

[jennyz, 2013/12/10 19:14:11]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TrayPower);
 };