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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 1286583002: Stop setting --enable-overlay-fullscreen-video on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: forgot namespace Created 5 years, 4 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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 RendererMediaPlayerManager* player_manager, 95 RendererMediaPlayerManager* player_manager,
96 media::CdmFactory* cdm_factory, 96 media::CdmFactory* cdm_factory,
97 media::MediaPermission* media_permission, 97 media::MediaPermission* media_permission,
98 blink::WebContentDecryptionModule* initial_cdm, 98 blink::WebContentDecryptionModule* initial_cdm,
99 scoped_refptr<StreamTextureFactory> factory, 99 scoped_refptr<StreamTextureFactory> factory,
100 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 100 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
101 media::MediaLog* media_log); 101 media::MediaLog* media_log);
102 virtual ~WebMediaPlayerAndroid(); 102 virtual ~WebMediaPlayerAndroid();
103 103
104 // blink::WebMediaPlayer implementation. 104 // blink::WebMediaPlayer implementation.
105 virtual bool supportsOverlayFullscreenVideo();
105 virtual void enterFullscreen(); 106 virtual void enterFullscreen();
106 107
107 // Resource loading. 108 // Resource loading.
108 virtual void load(LoadType load_type, 109 virtual void load(LoadType load_type,
109 const blink::WebURL& url, 110 const blink::WebURL& url,
110 CORSMode cors_mode); 111 CORSMode cors_mode);
111 112
112 // Playback controls. 113 // Playback controls.
113 virtual void play(); 114 virtual void play();
114 virtual void pause(); 115 virtual void pause();
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 524
524 // NOTE: Weak pointers must be invalidated before all other member variables. 525 // NOTE: Weak pointers must be invalidated before all other member variables.
525 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 526 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
526 527
527 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 528 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
528 }; 529 };
529 530
530 } // namespace content 531 } // namespace content
531 532
532 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 533 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698