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

Side by Side Diff: chromecast/shell/browser/android/external_video_surface_container_impl.h

Issue 643833002: Replace missed OVERRIDE with its C++11 counterparts in src/chromecast (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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H _ 5 #ifndef CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H _
6 #define CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H _ 6 #define CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H _
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "content/public/browser/android/external_video_surface_container.h" 13 #include "content/public/browser/android/external_video_surface_container.h"
14 14
15 namespace chromecast { 15 namespace chromecast {
16 namespace shell { 16 namespace shell {
17 17
18 class ExternalVideoSurfaceContainerImpl 18 class ExternalVideoSurfaceContainerImpl
19 : public content::ExternalVideoSurfaceContainer { 19 : public content::ExternalVideoSurfaceContainer {
20 public: 20 public:
21 typedef base::Callback<void(int, jobject)> SurfaceCreatedCB; 21 typedef base::Callback<void(int, jobject)> SurfaceCreatedCB;
22 typedef base::Callback<void(int)> SurfaceDestroyedCB; 22 typedef base::Callback<void(int)> SurfaceDestroyedCB;
23 23
24 ExternalVideoSurfaceContainerImpl(content::WebContents* contents); 24 ExternalVideoSurfaceContainerImpl(content::WebContents* contents);
25 25
26 // ExternalVideoSurfaceContainer implementation. 26 // ExternalVideoSurfaceContainer implementation.
27 virtual void RequestExternalVideoSurface( 27 virtual void RequestExternalVideoSurface(
28 int player_id, 28 int player_id,
29 const SurfaceCreatedCB& surface_created_cb, 29 const SurfaceCreatedCB& surface_created_cb,
30 const SurfaceDestroyedCB& surface_destroyed_cb) OVERRIDE; 30 const SurfaceDestroyedCB& surface_destroyed_cb) override;
31 virtual void ReleaseExternalVideoSurface(int player_id) OVERRIDE; 31 virtual void ReleaseExternalVideoSurface(int player_id) override;
32 virtual void OnFrameInfoUpdated() OVERRIDE; 32 virtual void OnFrameInfoUpdated() override;
33 virtual void OnExternalVideoSurfacePositionChanged( 33 virtual void OnExternalVideoSurfacePositionChanged(
34 int player_id, const gfx::RectF& rect) OVERRIDE; 34 int player_id, const gfx::RectF& rect) override;
35 35
36 // Methods called from Java. 36 // Methods called from Java.
37 void SurfaceCreated( 37 void SurfaceCreated(
38 JNIEnv* env, jobject obj, jint player_id, jobject jsurface); 38 JNIEnv* env, jobject obj, jint player_id, jobject jsurface);
39 void SurfaceDestroyed(JNIEnv* env, jobject obj, jint player_id); 39 void SurfaceDestroyed(JNIEnv* env, jobject obj, jint player_id);
40 40
41 private: 41 private:
42 virtual ~ExternalVideoSurfaceContainerImpl(); 42 virtual ~ExternalVideoSurfaceContainerImpl();
43 43
44 base::android::ScopedJavaGlobalRef<jobject> jobject_; 44 base::android::ScopedJavaGlobalRef<jobject> jobject_;
45 45
46 SurfaceCreatedCB surface_created_cb_; 46 SurfaceCreatedCB surface_created_cb_;
47 SurfaceDestroyedCB surface_destroyed_cb_; 47 SurfaceDestroyedCB surface_destroyed_cb_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl); 49 DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl);
50 }; 50 };
51 51
52 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env); 52 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env);
53 53
54 } // namespace shell 54 } // namespace shell
55 } // namespace chromecast 55 } // namespace chromecast
56 56
57 #endif // CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMP L_H_ 57 #endif // CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMP L_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698