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

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

Issue 1021723003: Android: Never automatically enter fullscreen when media playback starts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete IsProtectedSurfaceRequired(). Created 5 years, 9 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
« 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void OnAudibleStateChanged( 90 void OnAudibleStateChanged(
91 int player_id, bool is_audible_now) override; 91 int player_id, bool is_audible_now) override;
92 void OnWaitingForDecryptionKey(int player_id) override; 92 void OnWaitingForDecryptionKey(int player_id) override;
93 93
94 media::MediaResourceGetter* GetMediaResourceGetter() override; 94 media::MediaResourceGetter* GetMediaResourceGetter() override;
95 media::MediaUrlInterceptor* GetMediaUrlInterceptor() override; 95 media::MediaUrlInterceptor* GetMediaUrlInterceptor() override;
96 media::MediaPlayerAndroid* GetFullscreenPlayer() override; 96 media::MediaPlayerAndroid* GetFullscreenPlayer() override;
97 media::MediaPlayerAndroid* GetPlayer(int player_id) override; 97 media::MediaPlayerAndroid* GetPlayer(int player_id) override;
98 void RequestFullScreen(int player_id) override; 98 void RequestFullScreen(int player_id) override;
99 #if defined(VIDEO_HOLE) 99 #if defined(VIDEO_HOLE)
100 bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override;
101
102 void AttachExternalVideoSurface(int player_id, jobject surface); 100 void AttachExternalVideoSurface(int player_id, jobject surface);
103 void DetachExternalVideoSurface(int player_id); 101 void DetachExternalVideoSurface(int player_id);
104 void OnFrameInfoUpdated(); 102 void OnFrameInfoUpdated();
105 #endif // defined(VIDEO_HOLE) 103 #endif // defined(VIDEO_HOLE)
106 104
107 // Message handlers. 105 // Message handlers.
108 virtual void OnEnterFullscreen(int player_id); 106 virtual void OnEnterFullscreen(int player_id);
109 virtual void OnExitFullscreen(int player_id); 107 virtual void OnExitFullscreen(int player_id);
110 virtual void OnInitialize( 108 virtual void OnInitialize(
111 const MediaPlayerHostMsg_Initialize_Params& media_player_params); 109 const MediaPlayerHostMsg_Initialize_Params& media_player_params);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 201
204 // NOTE: Weak pointers must be invalidated before all other member variables. 202 // NOTE: Weak pointers must be invalidated before all other member variables.
205 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 203 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
206 204
207 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 205 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
208 }; 206 };
209 207
210 } // namespace content 208 } // namespace content
211 209
212 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 210 #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