| Index: chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| index 176fab2b688566cff71614cfa85730d5a5bc5bba..ab76037de82ba7786c0583d28cdb53545987c04d 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ash/accessibility_delegate.h"
|
| #include "ash/magnifier/magnifier_constants.h"
|
| +#include "ash/media_delegate.h"
|
| #include "ash/system/tray/default_system_tray_delegate.h"
|
| #include "base/command_line.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| @@ -44,6 +45,18 @@ class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
|
| DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl);
|
| };
|
|
|
| +class MediaDelegateImpl : public ash::MediaDelegate {
|
| + public:
|
| + MediaDelegateImpl() {}
|
| + virtual ~MediaDelegateImpl() {}
|
| + virtual void HandleMediaNextTrack() OVERRIDE {}
|
| + virtual void HandleMediaPlayPause() OVERRIDE {}
|
| + virtual void HandleMediaPrevTrack() OVERRIDE {}
|
| +
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl);
|
| +};
|
| +
|
| class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
|
| public:
|
| EmptyAccessibilityDelegate() {}
|
| @@ -126,6 +139,10 @@ ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() {
|
| return new NewWindowDelegateImpl;
|
| }
|
|
|
| +ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
|
| + return new MediaDelegateImpl;
|
| +}
|
| +
|
| ash::CapsLockDelegate* ChromeShellDelegate::CreateCapsLockDelegate() {
|
| return new CapsLockDelegate();
|
| }
|
| @@ -154,15 +171,6 @@ ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
|
| #endif
|
| }
|
|
|
| -void ChromeShellDelegate::HandleMediaNextTrack() {
|
| -}
|
| -
|
| -void ChromeShellDelegate::HandleMediaPlayPause() {
|
| -}
|
| -
|
| -void ChromeShellDelegate::HandleMediaPrevTrack() {
|
| -}
|
| -
|
| void ChromeShellDelegate::Observe(int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) {
|
|
|