Add Views DesktopMediaPicker into the Overall Views Build

This moves the code into the toolkit_views source list and gates Aura
specific code behind build flags.

BUG=726005,657883

Change-Id: I5e64ee0b16f2bfcb03da3bbc7c61486a786ee88d
Reviewed-on: https://chromium-review.googlesource.com/1097843Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566809}

chrome/browser/ui/BUILD.gn

@@ -2834,6 +2834,12 @@ split_static_library("ui") {
       "views/content_setting_domain_list_view.h",
       "views/cookie_info_view.cc",
       "views/cookie_info_view.h",
+      "views/desktop_capture/desktop_media_list_view.cc",
+      "views/desktop_capture/desktop_media_list_view.h",
+      "views/desktop_capture/desktop_media_picker_views.cc",
+      "views/desktop_capture/desktop_media_picker_views.h",
+      "views/desktop_capture/desktop_media_source_view.cc",
+      "views/desktop_capture/desktop_media_source_view.h",
       "views/device_chooser_content_view.cc",
       "views/device_chooser_content_view.h",
       "views/download/download_danger_prompt_views.cc",
@@ -3455,12 +3461,6 @@ split_static_library("ui") {
       "views/color_chooser_aura.h",
       "views/crypto_module_password_dialog_view.cc",
       "views/crypto_module_password_dialog_view.h",
-      "views/desktop_capture/desktop_media_list_view.cc",
-      "views/desktop_capture/desktop_media_list_view.h",
-      "views/desktop_capture/desktop_media_picker_views.cc",
-      "views/desktop_capture/desktop_media_picker_views.h",
-      "views/desktop_capture/desktop_media_source_view.cc",
-      "views/desktop_capture/desktop_media_source_view.h",
       "views/dropdown_bar_host_aura.cc",
       "views/frame/browser_non_client_frame_view_factory_chromeos.cc",
       "views/ime/ime_window_frame_view.cc",

chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc

@@ -10,6 +10,7 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/media/webrtc/desktop_media_list.h"
 #include "chrome/browser/media/webrtc/window_icon_util.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h"
@@ -20,9 +21,12 @@
 #include "content/public/browser/browser_thread.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "ui/accessibility/ax_node_data.h"
-#include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(OS_CHROMEOS)
+#include "ui/aura/window.h"
+#endif
+
 using content::DesktopMediaID;
 
 namespace {

chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

@@ -20,7 +20,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
@@ -33,11 +32,15 @@
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/wm/core/shadow_types.h"
 
+#if defined(USE_AURA)
+#include "ui/aura/window_tree_host.h"
+#endif
+
 using content::DesktopMediaID;
 
 namespace {
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA)
 DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
     gfx::AcceleratedWidget accelerated_widget) {
 #if defined(OS_WIN)
@@ -223,6 +226,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
   // the Id is passed to DesktopMediaList.
   DesktopMediaID dialog_window_id;
   if (!modal_dialog) {
+#if defined(USE_AURA)
     dialog_window_id = DesktopMediaID::RegisterAuraWindow(
         DesktopMediaID::TYPE_WINDOW, widget->GetNativeWindow());
 
@@ -230,7 +234,8 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
 #if !defined(OS_CHROMEOS)
     dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
         widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
-#endif
+#endif  // !defined(OS_CHROMEOS)
+#endif  // defined(USE_AURA)
   }
 
   for (auto* list_view : list_views_)

chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc

@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/browser/media/webrtc/fake_desktop_media_list.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
@@ -59,6 +60,12 @@ class DesktopMediaPickerViewsTest : public testing::Test {
     picker_params.app_name = app_name;
     picker_params.target_name = app_name;
     picker_params.request_audio = true;
+#if defined(OS_MACOSX)
+    // On Mac, we don't have a NativeView to provide to
+    // DialogDelegate::CreateDialogWidget for the default MODAL_TYPE_CHILD
+    // default. MODAL_TYPE_WINDOW works around this.
+    picker_params.modality = ui::ModalType::MODAL_TYPE_WINDOW;
+#endif
     picker_views_->Show(picker_params, std::move(source_lists),
                         base::Bind(&DesktopMediaPickerViewsTest::OnPickerDone,
                                    base::Unretained(this)));

chrome/test/BUILD.gn

@@ -1412,6 +1412,7 @@ test("browser_tests") {
         "../browser/ui/views/autofill/save_card_bubble_views_browsertest_base.h",
         "../browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc",
         "../browser/ui/views/bookmarks/bookmark_editor_view_browsertest.cc",
+        "../browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc",
         "../browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc",
         "../browser/ui/views/extensions/pwa_confirmation_view_browsertest.cc",
         "../browser/ui/views/external_protocol_dialog_browsertest.cc",
@@ -2099,15 +2100,12 @@ test("browser_tests") {
       data_deps += [ "//remoting/webapp" ]
     }
 
-    if (use_aura) {
-      sources += [ "../browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc" ]
-      if (enable_wifi_display) {
-        sources += [
-          "../../extensions/browser/api/display_source/display_source_apitestbase.cc",
-          "../../extensions/browser/api/display_source/display_source_apitestbase.h",
-          "../browser/extensions/api/display_source/display_source_wifi_display_apitest.cc",
-        ]
-      }
+    if (use_aura && enable_wifi_display) {
+      sources += [
+        "../../extensions/browser/api/display_source/display_source_apitestbase.cc",
+        "../../extensions/browser/api/display_source/display_source_apitestbase.h",
+        "../browser/extensions/api/display_source/display_source_wifi_display_apitest.cc",
+      ]
     }
 
     if (is_chromeos || (is_linux && use_dbus)) {
@@ -4344,6 +4342,7 @@ test("unit_tests") {
         "../browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc",
         "../browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc",
         "../browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc",
+        "../browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc",
         "../browser/ui/views/device_chooser_content_view_unittest.cc",
         "../browser/ui/views/download/download_item_view_unittest.cc",
         "../browser/ui/views/extensions/chooser_dialog_view_unittest.cc",
@@ -4385,7 +4384,6 @@ test("unit_tests") {
 
         # Get these compiling on Mac - see http://crbug.com/657883.
         "../browser/ui/views/crypto_module_password_dialog_view_unittest.cc",
-        "../browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc",
       ]
     }
   }