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

Unified Diff: media/gpu/android_video_surface_chooser_impl.h

Issue 2856253004: removed AndroidOverlayFactory (Closed)
Patch Set: cl feedvback Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: media/gpu/android_video_surface_chooser_impl.h
diff --git a/media/gpu/android_video_surface_chooser_impl.h b/media/gpu/android_video_surface_chooser_impl.h
index 9b9d4927a961ac435f55ff3bd856b73c259f965e..d8c72bda219c529533f9fb199d57fc2b31870959 100644
--- a/media/gpu/android_video_surface_chooser_impl.h
+++ b/media/gpu/android_video_surface_chooser_impl.h
@@ -9,7 +9,6 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "media/base/android/android_overlay.h"
-#include "media/base/android/android_overlay_factory.h"
#include "media/gpu/android_video_surface_chooser.h"
#include "media/gpu/media_gpu_export.h"
@@ -23,13 +22,11 @@ class MEDIA_GPU_EXPORT AndroidVideoSurfaceChooserImpl
~AndroidVideoSurfaceChooserImpl() override;
// AndroidVideoSurfaceChooser
- void Initialize(
- UseOverlayCB use_overlay_cb,
- UseSurfaceTextureCB use_surface_texture_cb,
- StopUsingOverlayImmediatelyCB stop_immediately_cb,
- std::unique_ptr<AndroidOverlayFactory> initial_factory) override;
- void ReplaceOverlayFactory(
- std::unique_ptr<AndroidOverlayFactory> factory) override;
+ void Initialize(UseOverlayCB use_overlay_cb,
+ UseSurfaceTextureCB use_surface_texture_cb,
+ StopUsingOverlayImmediatelyCB stop_immediately_cb,
+ AndroidOverlayFactoryCB initial_factory) override;
+ void ReplaceOverlayFactory(AndroidOverlayFactoryCB factory) override;
private:
// AndroidOverlay callbacks.
@@ -51,7 +48,7 @@ class MEDIA_GPU_EXPORT AndroidVideoSurfaceChooserImpl
// or a surface texture.
bool client_notification_pending_ = false;
- std::unique_ptr<AndroidOverlayFactory> overlay_factory_;
+ AndroidOverlayFactoryCB overlay_factory_;
base::WeakPtrFactory<AndroidVideoSurfaceChooserImpl> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698