DO NOT COMMIT - DialogSurface initial implementation.

media/base/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 
 assert(is_android)
 
+android_aidl("common_aidl") {
+  interface_file = "java/src/org/chromium/media/common.aidl"
+  import_include = "java/src"
+  sources = [
+    "java/src/org/chromium/media/IDialogSurfaceCallback.aidl",
+    "java/src/org/chromium/media/IDialogSurfaceController.aidl",
+    "java/src/org/chromium/media/IDialogSurfaceManager.aidl",
+  ]
+}
+
 source_set("android") {
   sources = [
     "access_unit_queue.cc",
     "access_unit_queue.h",
     "android_cdm_factory.cc",
     "android_cdm_factory.h",
     "audio_decoder_job.cc",
     "audio_decoder_job.h",
     "audio_media_codec_decoder.cc",
     "audio_media_codec_decoder.h",
     "demuxer_android.h",
     "demuxer_stream_player_params.cc",
     "demuxer_stream_player_params.h",
+    "dialog_surface_callback.cc",
+    "dialog_surface_callback.h",
+    "dialog_surface_controller.cc",
+    "dialog_surface_controller.h",
+    "dialog_surface_manager.cc",
+    "dialog_surface_manager.h",
     "media_client_android.cc",
     "media_client_android.h",
     "media_codec_bridge.cc",
     "media_codec_bridge.h",
     "media_codec_decoder.cc",
     "media_codec_decoder.h",
     "media_codec_player.cc",
     "media_codec_player.h",
     "media_codec_util.cc",
     "media_codec_util.h",
@@ skipping 70 matching lines @@
     "//testing/gtest",
     "//third_party/widevine/cdm:version_h",
   ]
   configs += [ "//media:media_config" ]
 }
 
 generate_jni("media_jni_headers") {
   sources = [
     "java/src/org/chromium/media/AudioManagerAndroid.java",
     "java/src/org/chromium/media/AudioRecordInput.java",
+    "java/src/org/chromium/media/DialogSurfaceCallback.java",
+    "java/src/org/chromium/media/DialogSurfaceControllerWrapper.java",
+    "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java",
     "java/src/org/chromium/media/MediaCodecBridge.java",
     "java/src/org/chromium/media/MediaCodecUtil.java",
     "java/src/org/chromium/media/MediaDrmBridge.java",
     "java/src/org/chromium/media/MediaPlayerBridge.java",
     "java/src/org/chromium/media/MediaPlayerListener.java",
   ]
   jni_package = "media"
 }
 
 android_library("media_java") {
   deps = [
     "//base:base_java",
+    "//media/base/android:common_aidl",
   ]
 
+  srcjar_deps = [ ":common_aidl" ]
+
   java_files = [
     "java/src/org/chromium/media/AudioManagerAndroid.java",
     "java/src/org/chromium/media/AudioRecordInput.java",
+    "java/src/org/chromium/media/DialogSurfaceCallback.java",
+    "java/src/org/chromium/media/DialogSurfaceController.java",
+    "java/src/org/chromium/media/DialogSurfaceControllerWrapper.java",
+    "java/src/org/chromium/media/DialogSurfaceManager.java",
+    "java/src/org/chromium/media/DialogSurfaceManagerWrapper.java",
     "java/src/org/chromium/media/MediaCodecBridge.java",
     "java/src/org/chromium/media/MediaCodecUtil.java",
     "java/src/org/chromium/media/MediaDrmBridge.java",
     "java/src/org/chromium/media/MediaPlayerBridge.java",
     "java/src/org/chromium/media/MediaPlayerListener.java",
   ]
 }