summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorsschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-27 17:38:00 +0000
committersschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-27 17:38:00 +0000
commite54e8193d26424fd4d31cbae3871158056403f82 (patch)
treeb015bec46abf46a9c2b2f7ce0294db7c804b897e /ash/test
parent79ec9aa6e75cd375b2010a938d61f33d214ebc03 (diff)
downloadchromium_src-e54e8193d26424fd4d31cbae3871158056403f82.zip
chromium_src-e54e8193d26424fd4d31cbae3871158056403f82.tar.gz
chromium_src-e54e8193d26424fd4d31cbae3871158056403f82.tar.bz2
Ash: Support "Next Song", "Previous Song", "Play/Pause" Multi Media buttons
in our Media Player that is part of the File Manager right now. Added shortcut handlers and plumbing to the Audio and Video player of the Ash File Manager. see also: http://code.google.com/p/chromium/issues/detail?id=123739#c17 BUG=138745 TEST=Attach an (Wired USB) Apple keyboard or Windows Natural keyboard to a Chromebook. Either download three mp3 and an mp4 file to your chromebook or navigate to a Google Drive folder that has these. Bring up File Manager from the Launcher and click on an mp3. Press the Previous Track, Play/Pause, Next Track keys on the MAC keyboard and observe same behavior as clicking the corresponding Audio Control buttons on the screen. Click on an mp4 and press the Play/Pause key and observe same behavior as clicking Play/Pause button on the screen. Repeat for Windows Natural keyboard with the Play/Pause key. (Note it does not have any prev./next track keys.) PS: The Goldtouch USB keyboard works as well. The media keys require holding done the "Fn" key and F1, F2, or F3. Review URL: https://chromiumcodereview.appspot.com/10823439 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/test_shell_delegate.cc9
-rw-r--r--ash/test/test_shell_delegate.h3
2 files changed, 12 insertions, 0 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 090d14a..3ecb75a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -118,5 +118,14 @@ void TestShellDelegate::OpenFeedbackPage() {
void TestShellDelegate::RecordUserMetricsAction(UserMetricsAction action) {
}
+void TestShellDelegate::HandleMediaNextTrack() {
+}
+
+void TestShellDelegate::HandleMediaPlayPause() {
+}
+
+void TestShellDelegate::HandleMediaPrevTrack() {
+}
+
} // namespace test
} // namespace ash
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 88b8616..7b4d2ea 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -44,6 +44,9 @@ class TestShellDelegate : public ShellDelegate {
virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
virtual void OpenFeedbackPage() OVERRIDE;
virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
+ virtual void HandleMediaNextTrack() OVERRIDE;
+ virtual void HandleMediaPlayPause() OVERRIDE;
+ virtual void HandleMediaPrevTrack() OVERRIDE;
private:
bool locked_;