Bug 912869 Rename 'Apps' and 'FastFwd' to 'MediaApps' and 'MediaFastForward' (and drop 'MediaApps' support) r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:54 +0900
changeset 247436 20b4fe3c7dcc573f4e0f8914c94ebbe3209d19ea
parent 247435 fbfc02e1c647a2c1c73c6de81614700cdc508d93
child 247437 e5860aab53a5fe1bec8fa29c6cccdf4fbe096d0a
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs912869
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 912869 Rename 'Apps' and 'FastFwd' to 'MediaApps' and 'MediaFastForward' (and drop 'MediaApps' support) r=smaug
b2g/chrome/content/shell.js
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -400,17 +400,17 @@ var shell = {
     let mediaKeys = {
       'MediaTrackNext': 'media-next-track-button',
       'MediaTrackPrevious': 'media-previous-track-button',
       'MediaPause': 'media-pause-button',
       'MediaPlay': 'media-play-button',
       'MediaPlayPause': 'media-play-pause-button',
       'MediaStop': 'media-stop-button',
       'MediaRewind': 'media-rewind-button',
-      'FastFwd': 'media-fast-forward-button'
+      'MediaFastForward': 'media-fast-forward-button'
     };
 
     let isMediaKey = false;
     if (mediaKeys[evt.key]) {
       isMediaKey = true;
       type = mediaKeys[evt.key];
     }
 
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -309,18 +309,18 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Guide)
 // DEFINE_KEYNAME_WITH_SAME_NAME(NextDay) // Rename to GuideNextDay
 // DEFINE_KEYNAME_WITH_SAME_NAME(PrevDay) // Rename to GuidePreviousDay
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
 // DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Link)
 // DEFINE_KEYNAME_WITH_SAME_NAME(List) // Rename to ListProgram
 DEFINE_KEYNAME_WITH_SAME_NAME(Live) // Rename to LiveContent
 // DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
-DEFINE_KEYNAME_WITH_SAME_NAME(Apps) // Rename to MediaApps
-DEFINE_KEYNAME_WITH_SAME_NAME(FastFwd) // Rename to MediaFastForward
+// DEFINE_KEYNAME_WITH_SAME_NAME(MediaApps)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaFastForward)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaLast)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
 // DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkip)
 // DEFINE_KEYNAME_WITH_SAME_NAME(NextFavoriteChannel)
 // DEFINE_KEYNAME_WITH_SAME_NAME(NextUserProfile)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -947,22 +947,19 @@ KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
 KEY_MAP_ANDROID (Guide, AKEYCODE_GUIDE)
 
 // Info
 KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
 
 // Live
 KEY_MAP_ANDROID (Live, AKEYCODE_TV)
 
-// Apps
-KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
-
-// FastFwd
-KEY_MAP_QT      (FastFwd, Qt::Key_AudioForward)
-KEY_MAP_ANDROID (FastFwd, AKEYCODE_MEDIA_FAST_FORWARD)
+// MediaFastForward
+KEY_MAP_QT      (MediaFastForward, Qt::Key_AudioForward)
+KEY_MAP_ANDROID (MediaFastForward, AKEYCODE_MEDIA_FAST_FORWARD)
 
 // MediaLast
 KEY_MAP_QT      (MediaLast, Qt::Key_MediaLast)
 
 // MediaPause
 KEY_MAP_GTK     (MediaPause, GDK_AudioPause)
 KEY_MAP_QT      (MediaPause, Qt::Key_MediaPause)
 KEY_MAP_ANDROID (MediaPause, AKEYCODE_MEDIA_PAUSE)