Mojo framework for AndroidOverlay.

media/mojo/clients/mojo_android_overlay.h

Index: media/mojo/clients/mojo_android_overlay.h
diff --git a/media/mojo/clients/mojo_android_overlay.h b/media/mojo/clients/mojo_android_overlay.h
new file mode 100644
index 0000000000000000000000000000000000000000..07a267614e5744358d8fee54c0cf3ac403cea429
--- /dev/null
+++ b/media/mojo/clients/mojo_android_overlay.h
@@ -0,0 +1,66 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_BASE_MOJO_ANDROID_OVERLAY_H_
+#define MEDIA_BASE_MOJO_ANDROID_OVERLAY_H_
+
+#include "base/macros.h"
+#include "media/base/android/android_overlay.h"
+#include "media/mojo/interfaces/android_overlay.mojom.h"
+
+namespace service_manager {
+namespace mojom {
+class InterfaceProvider;
+}
+}
+
+namespace media {
+
+class MojoAndroidOverlayClient;
+
+// AndroidOverlay implementation via mojo.
+class MojoAndroidOverlay : public AndroidOverlay {

[boliu, 2017/02/22 18:03:50]

I guess it's a bit odd to me that MojoFoo isn't actually a mojo type here and in
the factory. But not a big deal I guess

[liberato (no reviews please), 2017/02/22 19:10:50]

i agree, done.

originally i went back and forth on this.  it was more obviously doing what i
intended this way.  seems better now that i tried again.

+ public:
+  MojoAndroidOverlay(
+      service_manager::mojom::InterfaceProvider* interface_provider,
+      int render_frame_id,
+      int renderer_pid,
+      const AndroidOverlay::Config& config);
+
+  // Testing only.
+  MojoAndroidOverlay(mojom::AndroidOverlayProviderPtr provider_ptr,
+                     int render_frame_id,
+                     int renderer_pid,
+                     const AndroidOverlay::Config& config);
+
+  ~MojoAndroidOverlay() override;
+
+  void ScheduleLayout(const gfx::Rect& rect) override;
+
+  // MojoAndroidOverlayClient callbacks only.
+ public:
+  void OnInitialized(mojom::AndroidOverlayPtr ptr);
+  void OnSurfaceReady(uint32_t surface_key);
+  void OnDestroyed();
+
+ private:
+  void Setup(mojom::AndroidOverlayProviderPtr provider_ptr,
+             int render_frame_id,
+             int renderer_pid,
+             const AndroidOverlay::Config& config);
+  service_manager::mojom::InterfaceProvider* interface_provider_;
+  AndroidOverlay::Config config_;
+  mojom::AndroidOverlayProviderPtr provider_ptr_;
+  mojom::AndroidOverlayPtr overlay_ptr_;
+  std::unique_ptr<MojoAndroidOverlayClient> client_;
+
+  // Have we received OnSurfaceReady yet?
+  bool received_surface_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(MojoAndroidOverlay);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_MOJO_ANDROID_OVERLAY_H_