DialogSurfaceManager implementation.

content/app/android/child_process_service_impl.cc

Index: content/app/android/child_process_service_impl.cc
diff --git a/content/app/android/child_process_service_impl.cc b/content/app/android/child_process_service_impl.cc
index 66513172f0fd9a69a273362afbbf387e3767f3ff..117ce9c60d75277ade54fd59136ed07ce689e763 100644
--- a/content/app/android/child_process_service_impl.cc
+++ b/content/app/android/child_process_service_impl.cc
@@ -18,6 +18,7 @@
 #include "base/unguessable_token.h"
 #include "content/child/child_thread_impl.h"
 #include "content/public/common/content_descriptors.h"
+#include "gpu/ipc/common/android/dialog_surface_lookup.h"
 #include "gpu/ipc/common/android/scoped_surface_request_conduit.h"
 #include "gpu/ipc/common/android/surface_texture_peer.h"
 #include "gpu/ipc/common/gpu_surface_lookup.h"
@@ -38,7 +39,8 @@ namespace {
 // we're in a renderer or gpu process.
 class ChildProcessSurfaceManager : public gpu::SurfaceTexturePeer,
                                    public gpu::ScopedSurfaceRequestConduit,
-                                   public gpu::GpuSurfaceLookup {
+                                   public gpu::GpuSurfaceLookup,
+                                   public gpu::DialogSurfaceLookup {
  public:
   ChildProcessSurfaceManager() {}
   ~ChildProcessSurfaceManager() override {}
@@ -102,6 +104,15 @@ class ChildProcessSurfaceManager : public gpu::SurfaceTexturePeer,
                                                              surface_id));
   }
 
+  // Overridden from DialogSurfaceLookup:
+  base::android::ScopedJavaLocalRef<jobject> GetDialogSurfaceManager()
+      override {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    return  // base::android::ScopedJavaLocalRef<jobject>(

[boliu, 2017/01/04 23:14:39]

commented out code

[liberato (no reviews please), 2017/01/11 22:17:55]

Done.

+        Java_ChildProcessServiceImpl_getDialogSurfaceManager(
+            env, service_impl_.obj());
+  }
+
  private:
   friend struct base::DefaultLazyInstanceTraits<ChildProcessSurfaceManager>;
   // The instance of org.chromium.content.app.ChildProcessServiceImpl.
@@ -130,6 +141,8 @@ void InternalInitChildProcessImpl(JNIEnv* env,
       g_child_process_surface_manager.Pointer());
   gpu::ScopedSurfaceRequestConduit::SetInstance(
       g_child_process_surface_manager.Pointer());
+  gpu::DialogSurfaceLookup::InitInstance(
+      g_child_process_surface_manager.Pointer());
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env);
 }