| Index: media/base/android/android_overlay.h
|
| diff --git a/media/base/android/android_overlay.h b/media/base/android/android_overlay.h
|
| index 45741914114bafcbf3407b2b19079a66268c22d8..8b500a85d04a9961034ee43e3234489e55db6c89 100644
|
| --- a/media/base/android/android_overlay.h
|
| +++ b/media/base/android/android_overlay.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| +#include "media/base/android_overlay_config.h"
|
| #include "media/base/media_export.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/gl/android/scoped_java_surface.h"
|
| @@ -36,34 +37,6 @@ namespace media {
|
| // AndroidOverlay isn't technically supposed to do that.
|
| class MEDIA_EXPORT AndroidOverlay {
|
| public:
|
| - // Called when the overlay is ready for use, via |GetJavaSurface()|.
|
| - using ReadyCB = base::Callback<void(AndroidOverlay*)>;
|
| -
|
| - // Called when overlay has failed before |ReadyCB| is called. Will not be
|
| - // called after ReadyCB. It will be the last callback for the overlay.
|
| - using FailedCB = base::Callback<void(AndroidOverlay*)>;
|
| -
|
| - // Called when the overlay has been destroyed. This will not be called unless
|
| - // ReadyCB has been called. It will be the last callback for the overlay.
|
| - using DestroyedCB = base::Callback<void(AndroidOverlay*)>;
|
| -
|
| - // Configuration used to create an overlay.
|
| - struct Config {
|
| - public:
|
| - Config();
|
| - Config(const Config&);
|
| - ~Config();
|
| -
|
| - gfx::Rect rect;
|
| -
|
| - // Require a secure overlay?
|
| - bool secure = false;
|
| -
|
| - ReadyCB ready_cb;
|
| - FailedCB failed_cb;
|
| - DestroyedCB destroyed_cb;
|
| - };
|
| -
|
| virtual ~AndroidOverlay() {}
|
|
|
| // Schedules a relayout of this overlay. If called before the client is
|
|
|