summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
authorzhchbin@gmail.com <zhchbin@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 04:07:59 +0000
committerzhchbin@gmail.com <zhchbin@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 04:07:59 +0000
commit5eb4043e4f5c9db268145817598197beb20e2f08 (patch)
treedfe83c5eca61e23167adb47b207383a49a1921f8 /ui/base
parentdc5f8fd28b7c71926ba26b7bb8deedd5bbd32c62 (diff)
downloadchromium_src-5eb4043e4f5c9db268145817598197beb20e2f08.zip
chromium_src-5eb4043e4f5c9db268145817598197beb20e2f08.tar.gz
chromium_src-5eb4043e4f5c9db268145817598197beb20e2f08.tar.bz2
Parse media keys for named command in the manifest.
BUG=131612 Review URL: https://chromiumcodereview.appspot.com/23445013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/accelerators/accelerator.cc12
-rw-r--r--ui/base/strings/ui_strings.grd12
2 files changed, 24 insertions, 0 deletions
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index fbb60a7..d9560e2 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -155,6 +155,18 @@ base::string16 Accelerator::GetShortcutText() const {
case ui::VKEY_OEM_PERIOD:
string_id = IDS_APP_PERIOD_KEY;
break;
+ case ui::VKEY_MEDIA_NEXT_TRACK:
+ string_id = IDS_APP_MEDIA_NEXT_TRACK_KEY;
+ break;
+ case ui::VKEY_MEDIA_PLAY_PAUSE:
+ string_id = IDS_APP_MEDIA_PLAY_PAUSE_KEY;
+ break;
+ case ui::VKEY_MEDIA_PREV_TRACK:
+ string_id = IDS_APP_MEDIA_PREV_TRACK_KEY;
+ break;
+ case ui::VKEY_MEDIA_STOP:
+ string_id = IDS_APP_MEDIA_STOP_KEY;
+ break;
default:
break;
}
diff --git a/ui/base/strings/ui_strings.grd b/ui/base/strings/ui_strings.grd
index 8ce982d..5906138 100644
--- a/ui/base/strings/ui_strings.grd
+++ b/ui/base/strings/ui_strings.grd
@@ -1464,6 +1464,18 @@ need to be translated for each locale.-->
<message name="IDS_APP_PERIOD_KEY" desc="Period key">
Period
</message>
+ <message name="IDS_APP_MEDIA_NEXT_TRACK_KEY" desc="Media next track key">
+ Media Next Track
+ </message>
+ <message name="IDS_APP_MEDIA_PLAY_PAUSE_KEY" desc="Media play pause key">
+ Media Play/Pause
+ </message>
+ <message name="IDS_APP_MEDIA_PREV_TRACK_KEY" desc="Media previous track key">
+ Media Previous Track
+ </message>
+ <message name="IDS_APP_MEDIA_STOP_KEY" desc="Media stop key">
+ Media Stop
+ </message>
<!-- Shortcut Modifiers -->
<message name="IDS_APP_CONTROL_MODIFIER" desc="Control key shortcut modifier">