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

Side by Side Diff: media/base/android/media_player_bridge.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_source_player.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 MediaPlayerManager* manager, 50 MediaPlayerManager* manager,
51 const RequestMediaResourcesCB& request_media_resources_cb, 51 const RequestMediaResourcesCB& request_media_resources_cb,
52 const GURL& frame_url, 52 const GURL& frame_url,
53 bool allow_credentials); 53 bool allow_credentials);
54 virtual ~MediaPlayerBridge(); 54 virtual ~MediaPlayerBridge();
55 55
56 // Initialize this object and extract the metadata from the media. 56 // Initialize this object and extract the metadata from the media.
57 virtual void Initialize(); 57 virtual void Initialize();
58 58
59 // MediaPlayerAndroid implementation. 59 // MediaPlayerAndroid implementation.
60 virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) OVERRIDE; 60 virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
61 virtual void Start() OVERRIDE; 61 virtual void Start() override;
62 virtual void Pause(bool is_media_related_action ALLOW_UNUSED) OVERRIDE; 62 virtual void Pause(bool is_media_related_action ALLOW_UNUSED) override;
63 virtual void SeekTo(base::TimeDelta timestamp) OVERRIDE; 63 virtual void SeekTo(base::TimeDelta timestamp) override;
64 virtual void Release() OVERRIDE; 64 virtual void Release() override;
65 virtual void SetVolume(double volume) OVERRIDE; 65 virtual void SetVolume(double volume) override;
66 virtual int GetVideoWidth() OVERRIDE; 66 virtual int GetVideoWidth() override;
67 virtual int GetVideoHeight() OVERRIDE; 67 virtual int GetVideoHeight() override;
68 virtual base::TimeDelta GetCurrentTime() OVERRIDE; 68 virtual base::TimeDelta GetCurrentTime() override;
69 virtual base::TimeDelta GetDuration() OVERRIDE; 69 virtual base::TimeDelta GetDuration() override;
70 virtual bool IsPlaying() OVERRIDE; 70 virtual bool IsPlaying() override;
71 virtual bool CanPause() OVERRIDE; 71 virtual bool CanPause() override;
72 virtual bool CanSeekForward() OVERRIDE; 72 virtual bool CanSeekForward() override;
73 virtual bool CanSeekBackward() OVERRIDE; 73 virtual bool CanSeekBackward() override;
74 virtual bool IsPlayerReady() OVERRIDE; 74 virtual bool IsPlayerReady() override;
75 virtual GURL GetUrl() OVERRIDE; 75 virtual GURL GetUrl() override;
76 virtual GURL GetFirstPartyForCookies() OVERRIDE; 76 virtual GURL GetFirstPartyForCookies() override;
77 virtual bool IsSurfaceInUse() const OVERRIDE; 77 virtual bool IsSurfaceInUse() const override;
78 78
79 // MediaPlayerListener callbacks. 79 // MediaPlayerListener callbacks.
80 void OnVideoSizeChanged(int width, int height); 80 void OnVideoSizeChanged(int width, int height);
81 void OnMediaError(int error_type); 81 void OnMediaError(int error_type);
82 void OnBufferingUpdate(int percent); 82 void OnBufferingUpdate(int percent);
83 void OnPlaybackComplete(); 83 void OnPlaybackComplete();
84 void OnMediaInterrupted(); 84 void OnMediaInterrupted();
85 void OnSeekComplete(); 85 void OnSeekComplete();
86 void OnDidSetDataUriDataSource(JNIEnv* env, jobject obj, jboolean success); 86 void OnDidSetDataUriDataSource(JNIEnv* env, jobject obj, jboolean success);
87 87
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 // Weak pointer passed to |listener_| for callbacks. 196 // Weak pointer passed to |listener_| for callbacks.
197 // NOTE: Weak pointers must be invalidated before all other member variables. 197 // NOTE: Weak pointers must be invalidated before all other member variables.
198 base::WeakPtrFactory<MediaPlayerBridge> weak_factory_; 198 base::WeakPtrFactory<MediaPlayerBridge> weak_factory_;
199 199
200 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge); 200 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
201 }; 201 };
202 202
203 } // namespace media 203 } // namespace media
204 204
205 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 205 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_source_player.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698