diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 04:26:16 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 04:26:16 +0000 |
| commit | 96b35f2450f3421c95ab702131ff4c6d4b01054d (patch) | |
| tree | e05b9b44e8bc48047586baaacbab0ac77b3c67eb | |
| parent | 376658bd026f672b87ed0f08328d37a7313537d7 (diff) | |
| download | chromium_src-96b35f2450f3421c95ab702131ff4c6d4b01054d.zip chromium_src-96b35f2450f3421c95ab702131ff4c6d4b01054d.tar.gz chromium_src-96b35f2450f3421c95ab702131ff4c6d4b01054d.tar.bz2 | |
Use the short message for spring usb charger notification.
BUG=321415
Review URL: https://codereview.chromium.org/65533016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236144 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/ash_chromeos_strings.grdp | 3 | ||||
| -rw-r--r-- | ash/system/chromeos/power/tray_power.cc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ash/ash_chromeos_strings.grdp b/ash/ash_chromeos_strings.grdp index 8adf94c..5c9293c 100644 --- a/ash/ash_chromeos_strings.grdp +++ b/ash/ash_chromeos_strings.grdp @@ -10,6 +10,9 @@ <message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_MESSAGE" desc="The message body of a notification indicating that a low-current USB charger has been connected."> Your Chromebook may not charge while it is turned on. Consider using the official charger. </message> + <message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_MESSAGE_SHORT" desc="The message body of a notification indicating that a low-current USB charger has been connected, short version."> + Your Chromebook may not charge while it is turned on. + </message> <!-- Status Tray Network strings --> <message name="IDS_ASH_STATUS_TRAY_NETWORK" desc="The label used in the network dialog header."> diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index a0d7e5d..1eb0048 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -195,7 +195,8 @@ bool TrayPower::MaybeShowUsbChargerNotification() { message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId, rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_TITLE), - rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_MESSAGE), + rb.GetLocalizedString( + IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_MESSAGE_SHORT), rb.GetImageNamed(IDR_AURA_NOTIFICATION_LOW_POWER_CHARGER), base::string16(), message_center::NotifierId(system_notifier::NOTIFIER_POWER), |