Partial revert of "Restart fullscreen video playback when switching back from background"

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 <map>
 #include <set>
 #include <string>
@@ skipping 31 matching lines @@
     : public WebContentsObserver,
       public media::MediaPlayerManager {
  public:
   // Permits embedders to provide an extended version of the class.
   typedef BrowserMediaPlayerManager* (*Factory)(RenderViewHost*);
   static void RegisterFactory(Factory factory);
 
   // Returns a new instance using the registered factory if available.
   static BrowserMediaPlayerManager* Create(RenderViewHost* rvh);
 
   ContentViewCoreImpl* GetContentViewCore() const;

[bulach, 2014/02/13 12:02:44]

nit: ditto..

 
   virtual ~BrowserMediaPlayerManager();
 
   // WebContentsObserver overrides.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Fullscreen video playback controls.
   virtual void FullscreenPlayerPlay();
   virtual void FullscreenPlayerPause();
   virtual void FullscreenPlayerSeek(int msec);
   virtual void ExitFullscreen(bool release_media_player);
   virtual void SetVideoSurface(gfx::ScopedJavaSurface surface);
-  virtual void SuspendFullscreen();
-  virtual void ResumeFullscreen(gfx::ScopedJavaSurface surface);
 
   // Called when browser player wants the renderer media element to seek.
   // Any actual seek started by renderer will be handled by browser in OnSeek().
   void OnSeekRequest(int player_id, const base::TimeDelta& time_to_seek);
 
   // media::MediaPlayerManager overrides.
   virtual void OnTimeUpdate(
       int player_id, base::TimeDelta current_time) OVERRIDE;
   virtual void OnMediaMetadataChanged(
       int player_id,
@@ skipping 147 matching lines @@
   // The fullscreen video view object or NULL if video is not played in
   // fullscreen.
   scoped_ptr<ContentVideoView> video_view_;
 
   // Player ID of the fullscreen media player.
   int fullscreen_player_id_;
 
   // The player ID pending to enter fullscreen.
   int pending_fullscreen_player_id_;
 
+  // Whether the fullscreen player has been Release()-d.
+  bool fullscreen_player_is_released_;
+
   WebContents* web_contents_;
 
   // Object for retrieving resources media players.
   scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_