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

Side by Side Diff: content/browser/media/android/browser_media_player_manager.h

Issue 378543002: Skip to enter the fullscreen automatically when hole-punching is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: guarded by VIDEO_HOLE. Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual void OnSeekComplete( 80 virtual void OnSeekComplete(
81 int player_id, 81 int player_id,
82 const base::TimeDelta& current_time) OVERRIDE; 82 const base::TimeDelta& current_time) OVERRIDE;
83 virtual void OnError(int player_id, int error) OVERRIDE; 83 virtual void OnError(int player_id, int error) OVERRIDE;
84 virtual void OnVideoSizeChanged( 84 virtual void OnVideoSizeChanged(
85 int player_id, int width, int height) OVERRIDE; 85 int player_id, int width, int height) OVERRIDE;
86 virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE; 86 virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE;
87 virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE; 87 virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE;
88 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE; 88 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
89 virtual void RequestFullScreen(int player_id) OVERRIDE; 89 virtual void RequestFullScreen(int player_id) OVERRIDE;
90 #if defined(VIDEO_HOLE)
91 virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() OVERRIDE;
90 92
91 #if defined(VIDEO_HOLE)
92 void AttachExternalVideoSurface(int player_id, jobject surface); 93 void AttachExternalVideoSurface(int player_id, jobject surface);
93 void DetachExternalVideoSurface(int player_id); 94 void DetachExternalVideoSurface(int player_id);
94 void OnFrameInfoUpdated(); 95 void OnFrameInfoUpdated();
95 #endif // defined(VIDEO_HOLE) 96 #endif // defined(VIDEO_HOLE)
96 97
97 // Message handlers. 98 // Message handlers.
98 virtual void OnEnterFullscreen(int player_id); 99 virtual void OnEnterFullscreen(int player_id);
99 virtual void OnExitFullscreen(int player_id); 100 virtual void OnExitFullscreen(int player_id);
100 virtual void OnInitialize( 101 virtual void OnInitialize(
101 const MediaPlayerHostMsg_Initialize_Params& media_player_params); 102 const MediaPlayerHostMsg_Initialize_Params& media_player_params);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 186
186 // NOTE: Weak pointers must be invalidated before all other member variables. 187 // NOTE: Weak pointers must be invalidated before all other member variables.
187 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 188 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
188 189
189 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 190 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
190 }; 191 };
191 192
192 } // namespace content 193 } // namespace content
193 194
194 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 195 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698