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

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

Issue 382423002: remove WebMediaPlayerAndroid::exitFullscreen() call (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/renderer/media/android/webmediaplayer_android.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_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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 base::WeakPtr<WebMediaPlayerDelegate> delegate, 75 base::WeakPtr<WebMediaPlayerDelegate> delegate,
76 RendererMediaPlayerManager* player_manager, 76 RendererMediaPlayerManager* player_manager,
77 RendererCdmManager* cdm_manager, 77 RendererCdmManager* cdm_manager,
78 scoped_refptr<StreamTextureFactory> factory, 78 scoped_refptr<StreamTextureFactory> factory,
79 const scoped_refptr<base::MessageLoopProxy>& media_loop, 79 const scoped_refptr<base::MessageLoopProxy>& media_loop,
80 media::MediaLog* media_log); 80 media::MediaLog* media_log);
81 virtual ~WebMediaPlayerAndroid(); 81 virtual ~WebMediaPlayerAndroid();
82 82
83 // blink::WebMediaPlayer implementation. 83 // blink::WebMediaPlayer implementation.
84 virtual void enterFullscreen(); 84 virtual void enterFullscreen();
85 virtual void exitFullscreen();
86 virtual bool canEnterFullscreen() const; 85 virtual bool canEnterFullscreen() const;
87 86
88 // Resource loading. 87 // Resource loading.
89 virtual void load(LoadType load_type, 88 virtual void load(LoadType load_type,
90 const blink::WebURL& url, 89 const blink::WebURL& url,
91 CORSMode cors_mode); 90 CORSMode cors_mode);
92 91
93 // Playback controls. 92 // Playback controls.
94 virtual void play(); 93 virtual void play();
95 virtual void pause(); 94 virtual void pause();
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 444
446 // NOTE: Weak pointers must be invalidated before all other member variables. 445 // NOTE: Weak pointers must be invalidated before all other member variables.
447 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 446 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
448 447
449 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 448 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
450 }; 449 };
451 450
452 } // namespace content 451 } // namespace content
453 452
454 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 453 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698