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 ccfe795e5bb83b11e2bfe07fdae2783dbb40fa7c..d22eedc462bf36d58f1adbea4814f94700b0a649 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 "ash/wm/window_util.h" |
#include "base/command_line.h" |
@@ -47,6 +48,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() {} |
@@ -129,6 +142,10 @@ ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { |
return new NewWindowDelegateImpl; |
} |
+ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { |
+ return new MediaDelegateImpl; |
+} |
+ |
ash::CapsLockDelegate* ChromeShellDelegate::CreateCapsLockDelegate() { |
return new CapsLockDelegate(); |
} |
@@ -157,15 +174,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) { |