Skip to content

GitLab

T
tangled
Commit 81ba5232 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot
Browse files
Options

Clean up deprecated sources assignment filter in //ui 

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: Id133ab0b0744c07405d0ed69eb9774b27b5c09f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442540
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812827}
parent 10f17f42
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 69 deletions
ui/accessibility/platform/BUILD.gn
View file @ 81ba5232
......@@ -15,13 +15,6 @@ if (is_win) {
import("//build/toolchain/win/midl.gni")
}
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
if (is_win) {
midl("ichromeaccessible") {
sources = [ "ichromeaccessible.idl" ]
......@@ -73,30 +66,33 @@ source_set("platform") {
if (has_native_accessibility) {
sources += [
"ax_fragment_root_delegate_win.h",
"ax_fragment_root_win.cc",
"ax_fragment_root_win.h",
"ax_platform_node_delegate_utils_win.cc",
"ax_platform_node_delegate_utils_win.h",
"ax_platform_node_textchildprovider_win.cc",
"ax_platform_node_textchildprovider_win.h",
"ax_platform_node_textprovider_win.cc",
"ax_platform_node_textprovider_win.h",
"ax_platform_node_textrangeprovider_win.cc",
"ax_platform_node_textrangeprovider_win.h",
"ax_platform_node_win.cc",
"ax_platform_node_win.h",
"ax_platform_relation_win.cc",
"ax_platform_relation_win.h",
"ax_platform_text_boundary.cc",
"ax_platform_text_boundary.h",
"ax_system_caret_win.cc",
"ax_system_caret_win.h",
"uia_registrar_win.cc",
"uia_registrar_win.h",
]
if (is_win) {
sources += [
"ax_fragment_root_delegate_win.h",
"ax_fragment_root_win.cc",
"ax_fragment_root_win.h",
"ax_platform_node_delegate_utils_win.cc",
"ax_platform_node_delegate_utils_win.h",
"ax_platform_node_textchildprovider_win.cc",
"ax_platform_node_textchildprovider_win.h",
"ax_platform_node_textprovider_win.cc",
"ax_platform_node_textprovider_win.h",
"ax_platform_node_textrangeprovider_win.cc",
"ax_platform_node_textrangeprovider_win.h",
"ax_platform_node_win.cc",
"ax_platform_node_win.h",
"ax_platform_relation_win.cc",
"ax_platform_relation_win.h",
"ax_system_caret_win.cc",
"ax_system_caret_win.h",
"uia_registrar_win.cc",
"uia_registrar_win.h",
]
public_deps += [
"//third_party/iaccessible2",
"//ui/accessibility/platform:ichromeaccessible",
......
ui/aura/BUILD.gn
View file @ 81ba5232
......@@ -5,13 +5,6 @@
import("//build/config/ui.gni")
import("//testing/test.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
component("aura") {
public = [
"client/aura_constants.h",
......@@ -39,7 +32,6 @@ component("aura") {
"env_observer.h",
"event_injector.h",
"input_state_lookup.h",
"input_state_lookup_win.h",
"layout_manager.h",
"null_window_targeter.h",
"scoped_enable_unadjusted_mouse_events.h",
......@@ -81,12 +73,9 @@ component("aura") {
"env_input_state_controller.cc",
"event_injector.cc",
"input_state_lookup.cc",
"input_state_lookup_win.cc",
"layout_manager.cc",
"native_window_occlusion_tracker.cc",
"native_window_occlusion_tracker.h",
"native_window_occlusion_tracker_win.cc",
"native_window_occlusion_tracker_win.h",
"null_window_targeter.cc",
"scoped_keyboard_hook.cc",
"scoped_simple_keyboard_hook.cc",
......@@ -147,6 +136,15 @@ component("aura") {
"//ui/compositor",
]
if (is_win) {
public += [ "input_state_lookup_win.h" ]
sources += [
"input_state_lookup_win.cc",
"native_window_occlusion_tracker_win.cc",
"native_window_occlusion_tracker_win.h",
]
}
if (use_x11) {
public_deps += [ "//ui/base/x" ]
deps += [
......
ui/aura_extra/BUILD.gn
View file @ 81ba5232
......@@ -4,22 +4,11 @@
import("//build/config/ui.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
component("aura_extra") {
sources = [
"aura_extra_export.h",
"image_window_delegate.cc",
"image_window_delegate.h",
"window_occlusion_impl_win.cc",
"window_occlusion_impl_win.h",
"window_occlusion_win.cc",
"window_occlusion_win.h",
]
defines = [ "AURA_EXTRA_IMPLEMENTATION" ]
......@@ -34,6 +23,15 @@ component("aura_extra") {
"//ui/gfx",
"//ui/gfx/geometry",
]
if (is_win) {
sources += [
"window_occlusion_impl_win.cc",
"window_occlusion_impl_win.h",
"window_occlusion_win.cc",
"window_occlusion_win.h",
]
}
}
source_set("vector_resource") {
......@@ -66,10 +64,7 @@ source_set("window_position_in_root_monitor") {
source_set("tests") {
testonly = true
sources = [
"window_occlusion_impl_unittest_win.cc",
"window_position_in_root_monitor_unittest.cc",
]
sources = [ "window_position_in_root_monitor_unittest.cc" ]
deps = [
":aura_extra",
......@@ -82,4 +77,8 @@ source_set("tests") {
"//ui/gfx/geometry",
"//ui/platform_window",
]
if (is_win) {
sources += [ "window_occlusion_impl_unittest_win.cc" ]
}
}
ui/events/ozone/BUILD.gn
View file @ 81ba5232
......@@ -5,21 +5,12 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
assert(use_ozone)
component("ozone") {
output_name = "events_ozone"
sources = [
"chromeos/cursor_controller.cc",
"chromeos/cursor_controller.h",
"device/device_event.cc",
"device/device_event.h",
"device/device_event_observer.h",
......@@ -49,6 +40,13 @@ component("ozone") {
defines = [ "IS_EVENTS_OZONE_IMPL" ]
if (is_chromeos) {
sources += [
"chromeos/cursor_controller.cc",
"chromeos/cursor_controller.h",
]
}
if (use_udev) {
sources += [
"device/udev/device_manager_udev.cc",
......
ui/message_center/BUILD.gn
View file @ 81ba5232
......@@ -8,13 +8,6 @@ import("//components/vector_icons/vector_icons.gni")
import("//testing/test.gni")
import("//ui/base/ui_features.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
aggregate_vector_icons2("message_center_vector_icons") {
icon_directory = "vector_icons"
......@@ -102,7 +95,6 @@ component("message_center") {
"views/message_popup_collection.h",
"views/message_popup_view.cc",
"views/message_popup_view.h",
"views/message_popup_view_mac.mm",
"views/message_view.cc",
"views/message_view.h",
"views/message_view_factory.cc",
......@@ -122,6 +114,9 @@ component("message_center") {
"views/relative_time_formatter.cc",
"views/relative_time_formatter.h",
]
if (is_mac) {
sources += [ "views/message_popup_view_mac.mm" ]
}
deps += [
"//ui/compositor",
"//ui/events",
......
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