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

Side by Side Diff: chrome/browser/media/android/remote/remote_media_player_manager.h

Issue 1215713021: Reverted the code for the non-interactive audible tab notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notification
Patch Set: Fixed indent Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_REMOTE_REMOTE_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_REMOTE_REMOTE_MEDIA_PLAYER_MANAGER_H_
6 #define CHROME_BROWSER_MEDIA_ANDROID_REMOTE_REMOTE_MEDIA_PLAYER_MANAGER_H_ 6 #define CHROME_BROWSER_MEDIA_ANDROID_REMOTE_REMOTE_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" 12 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
13 #include "content/browser/media/android/browser_media_player_manager.h" 13 #include "content/browser/media/android/browser_media_player_manager.h"
14 #include "media/base/android/media_player_android.h" 14 #include "media/base/android/media_player_android.h"
15 15
16 struct MediaPlayerHostMsg_Initialize_Params; 16 struct MediaPlayerHostMsg_Initialize_Params;
17 17
18 namespace remote_media { 18 namespace remote_media {
19 19
20 // media::MediaPlayerManager implementation that allows the user to play media 20 // media::MediaPlayerManager implementation that allows the user to play media
21 // remotely. 21 // remotely.
22 class RemoteMediaPlayerManager : public content::BrowserMediaPlayerManager { 22 class RemoteMediaPlayerManager : public content::BrowserMediaPlayerManager {
23 public: 23 public:
24 RemoteMediaPlayerManager( 24 explicit RemoteMediaPlayerManager(
25 content::RenderFrameHost* render_frame_host, 25 content::RenderFrameHost* render_frame_host);
26 content::MediaPlayersObserver* audio_monitor);
27 ~RemoteMediaPlayerManager() override; 26 ~RemoteMediaPlayerManager() override;
28 27
29 void OnPlaying(int player_id); 28 void OnPlaying(int player_id);
30 void OnPaused(int player_id); 29 void OnPaused(int player_id);
31 30
32 // Callback to trigger when a remote device has been selected. 31 // Callback to trigger when a remote device has been selected.
33 void OnRemoteDeviceSelected(int player_id); 32 void OnRemoteDeviceSelected(int player_id);
34 33
35 // Callback to trigger when a remote device has been unselected. 34 // Callback to trigger when a remote device has been unselected.
36 void OnRemoteDeviceUnselected(int player_id); 35 void OnRemoteDeviceUnselected(int player_id);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 ScopedVector<RemoteMediaPlayerBridge> remote_players_; 105 ScopedVector<RemoteMediaPlayerBridge> remote_players_;
107 106
108 base::WeakPtrFactory<RemoteMediaPlayerManager> weak_ptr_factory_; 107 base::WeakPtrFactory<RemoteMediaPlayerManager> weak_ptr_factory_;
109 108
110 DISALLOW_COPY_AND_ASSIGN(RemoteMediaPlayerManager); 109 DISALLOW_COPY_AND_ASSIGN(RemoteMediaPlayerManager);
111 }; 110 };
112 111
113 } // namespace remote_media 112 } // namespace remote_media
114 113
115 #endif // CHROME_BROWSER_MEDIA_ANDROID_REMOTE_REMOTE_MEDIA_PLAYER_MANAGER_H_ 114 #endif // CHROME_BROWSER_MEDIA_ANDROID_REMOTE_REMOTE_MEDIA_PLAYER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698