Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 253183003: Media indicator for background recording task (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win build Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 3bfe3df05a3c8f6904344adb3640c8282c3946cd..138ad5aabe7870a026037c6749a7531aad6b5937 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -7,7 +7,6 @@
#include "ash/accelerators/magnifier_key_scroller.h"
#include "ash/accelerators/spoken_feedback_toggler.h"
#include "ash/accessibility_delegate.h"
-#include "ash/media_delegate.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
@@ -20,8 +19,6 @@
#include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
#include "chrome/browser/chromeos/display/display_configuration_observer.h"
#include "chrome/browser/chromeos/display/display_preferences.h"
-#include "chrome/browser/chromeos/extensions/media_player_api.h"
-#include "chrome/browser/chromeos/extensions/media_player_event_router.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -29,6 +26,7 @@
#include "chrome/browser/speech/tts_controller.h"
#include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
#include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"
+#include "chrome/browser/ui/ash/media_delegate_chromeos.h"
#include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
#include "chrome/browser/ui/browser.h"
@@ -209,33 +207,6 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl);
};
-class MediaDelegateImpl : public ash::MediaDelegate {
- public:
- MediaDelegateImpl() {}
- virtual ~MediaDelegateImpl() {}
-
- virtual void HandleMediaNextTrack() OVERRIDE {
- extensions::MediaPlayerAPI::Get(
- ProfileManager::GetActiveUserProfile())->
- media_player_event_router()->NotifyNextTrack();
- }
-
- virtual void HandleMediaPlayPause() OVERRIDE {
- extensions::MediaPlayerAPI::Get(
- ProfileManager::GetActiveUserProfile())->
- media_player_event_router()->NotifyTogglePlayState();
- }
-
- virtual void HandleMediaPrevTrack() OVERRIDE {
- extensions::MediaPlayerAPI::Get(
- ProfileManager::GetActiveUserProfile())->
- media_player_event_router()->NotifyPrevTrack();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl);
-};
-
} // anonymous namespace
bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
@@ -268,7 +239,7 @@ ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() {
}
ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
- return new MediaDelegateImpl;
+ return new MediaDelegateChromeOS;
}
ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698