Skip to content

GitLab

T
tangled
Commit 7830b6cc authored by Robert Liao's avatar Robert Liao Committed by Commit Bot
Browse files
Options

Revert "Add Views DesktopMediaPicker into the Overall Views Build" 

This reverts commit 170f8510.

Reason for revert: Causing some unit_test failures on Mac 10.10
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac10.10%20Tests
starting around 33081


Original change's description:
> 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/1097843
> Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
> Commit-Queue: Robert Liao <robliao@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#566809}

TBR=ellyjones@chromium.org,robliao@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 726005, 657883
Change-Id: I4b8c6d38c1df4453ae1ee404f88a57046a908f35
Reviewed-on: https://chromium-review.googlesource.com/1101098Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567327}
parent 6f6e54e8
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 34 deletions
chrome/browser/ui/BUILD.gn
View file @ 7830b6cc
......@@ -2837,12 +2837,6 @@ 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",
......@@ -3466,6 +3460,12 @@ 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
View file @ 7830b6cc
......@@ -10,7 +10,6 @@
#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"
......@@ -21,11 +20,8 @@
#include "content/public/browser/browser_thread.h"
#include "extensions/grit/extensions_browser_resources.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/resource/resource_bundle.h"
#if defined(OS_CHROMEOS)
#include "ui/aura/window.h"
#endif
#include "ui/base/resource/resource_bundle.h"
using content::DesktopMediaID;
......
chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
View file @ 7830b6cc
......@@ -20,6 +20,7 @@
#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"
......@@ -32,15 +33,11 @@
#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) && defined(USE_AURA)
#if !defined(OS_CHROMEOS)
DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
gfx::AcceleratedWidget accelerated_widget) {
#if defined(OS_WIN)
......@@ -226,7 +223,6 @@ 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());
......@@ -234,8 +230,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
#if !defined(OS_CHROMEOS)
dialog_window_id.id = AcceleratedWidgetToDesktopMediaId(
widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
#endif // !defined(OS_CHROMEOS)
#endif // defined(USE_AURA)
#endif
}
for (auto* list_view : list_views_)
......
chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc
View file @ 7830b6cc
......@@ -10,7 +10,6 @@
#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"
......@@ -60,12 +59,6 @@ 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
View file @ 7830b6cc
......@@ -1411,7 +1411,6 @@ 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",
......@@ -2098,12 +2097,15 @@ test("browser_tests") {
data_deps += [ "//remoting/webapp" ]
}
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 (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 (is_chromeos || (is_linux && use_dbus)) {
......@@ -4343,7 +4345,6 @@ 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,6 +4386,7 @@ 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",
]
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment