Reverted the code for the non-interactive audible tab notification

content/browser/media/android/browser_media_player_manager.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 14 matching lines @@
 namespace media {
 class DemuxerAndroid;
 }
 
 struct MediaPlayerHostMsg_Initialize_Params;
 
 namespace content {
 class BrowserDemuxerAndroid;
 class ContentViewCoreImpl;
 class ExternalVideoSurfaceContainer;
-class MediaPlayersObserver;
 class RenderFrameHost;
 class WebContents;
 
 // This class manages all the MediaPlayerAndroid objects.
 // It receives control operations from the the render process, and forwards
 // them to corresponding MediaPlayerAndroid object. Callbacks from
 // MediaPlayerAndroid objects are converted to IPCs and then sent to the render
 // process.
 class CONTENT_EXPORT BrowserMediaPlayerManager
     : public media::MediaPlayerManager,
       public MediaSessionObserver {
  public:
   // Permits embedders to provide an extended version of the class.
-  typedef BrowserMediaPlayerManager* (*Factory)(RenderFrameHost*,
-                                                MediaPlayersObserver*);
+  typedef BrowserMediaPlayerManager* (*Factory)(RenderFrameHost*);
   static void RegisterFactory(Factory factory);
 
   // Permits embedders to handle custom urls.
   static void RegisterMediaUrlInterceptor(
       media::MediaUrlInterceptor* media_url_interceptor);
 
   // Pass a java surface object to the MediaPlayerAndroid object
   // identified by render process handle, render frame ID and player ID.
   static void SetSurfacePeer(scoped_refptr<gfx::SurfaceTexture> surface_texture,
                              base::ProcessHandle render_process_handle,
                              int render_frame_id,
                              int player_id);
 
   // Returns a new instance using the registered factory if available.
-  static BrowserMediaPlayerManager* Create(
-      RenderFrameHost* rfh,
-      MediaPlayersObserver* audio_monitor);
+  static BrowserMediaPlayerManager* Create(RenderFrameHost* rfh);
 
   ContentViewCore* GetContentViewCore() const;
 
   ~BrowserMediaPlayerManager() override;
 
   // Fullscreen video playback controls.
   virtual void ExitFullscreen(bool release_media_player);
   virtual void SetVideoSurface(gfx::ScopedJavaSurface surface);
 
   // Called when browser player wants the renderer media element to seek.
@@ skipping 12 matching lines @@
                               int width,
                               int height,
                               bool success) override;
   void OnPlaybackComplete(int player_id) override;
   void OnMediaInterrupted(int player_id) override;
   void OnBufferingUpdate(int player_id, int percentage) override;
   void OnSeekComplete(int player_id,
                       const base::TimeDelta& current_time) override;
   void OnError(int player_id, int error) override;
   void OnVideoSizeChanged(int player_id, int width, int height) override;
-  void OnAudibleStateChanged(
-      int player_id, bool is_audible_now) override;
   void OnWaitingForDecryptionKey(int player_id) override;
 
   media::MediaResourceGetter* GetMediaResourceGetter() override;
   media::MediaUrlInterceptor* GetMediaUrlInterceptor() override;
   media::MediaPlayerAndroid* GetFullscreenPlayer() override;
   media::MediaPlayerAndroid* GetPlayer(int player_id) override;
   bool RequestPlay(int player_id) override;
 #if defined(VIDEO_HOLE)
   void AttachExternalVideoSurface(int player_id, jobject surface);
   void DetachExternalVideoSurface(int player_id);
@@ skipping 18 matching lines @@
   virtual void OnRequestRemotePlayback(int player_id);
   virtual void OnRequestRemotePlaybackControl(int player_id);
   virtual void ReleaseFullscreenPlayer(media::MediaPlayerAndroid* player);
 #if defined(VIDEO_HOLE)
   void OnNotifyExternalSurface(
       int player_id, bool is_request, const gfx::RectF& rect);
 #endif  // defined(VIDEO_HOLE)
 
  protected:
   // Clients must use Create() or subclass constructor.
-  BrowserMediaPlayerManager(RenderFrameHost* render_frame_host,
-                            MediaPlayersObserver* audio_monitor);
+  explicit BrowserMediaPlayerManager(RenderFrameHost* render_frame_host);
 
   WebContents* web_contents() const { return web_contents_; }
 
   // Adds a given player to the list.
   void AddPlayer(media::MediaPlayerAndroid* player);
 
   // Removes the player with the specified id.
   void RemovePlayer(int player_id);
 
   // Replaces a player with the specified id with a given MediaPlayerAndroid
@@ skipping 28 matching lines @@
   // Releases the player. However, don't remove it from |players_|.
   void ReleasePlayer(media::MediaPlayerAndroid* player);
 
 #if defined(VIDEO_HOLE)
   void ReleasePlayerOfExternalVideoSurfaceIfNeeded(int future_player);
   void OnRequestExternalSurface(int player_id, const gfx::RectF& rect);
 #endif  // defined(VIDEO_HOLE)
 
   RenderFrameHost* const render_frame_host_;
 
-  MediaPlayersObserver* audio_monitor_;
-
   // An array of managed players.
   ScopedVector<media::MediaPlayerAndroid> players_;
 
   // The fullscreen video view object or NULL if video is not played in
   // fullscreen.
   scoped_ptr<ContentVideoView> video_view_;
 
 #if defined(VIDEO_HOLE)
   scoped_ptr<ExternalVideoSurfaceContainer> external_video_surface_container_;
 #endif
@@ skipping 11 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_