Commit c7dcb643 authored by Trent Apted's avatar Trent Apted Committed by Commit Bot

Delineate internal/external headers for ui/views/cocoa in views/BUILD.gn

Since https://crbug.com/732993 was fixed, gn now supports a `friend`
property which the ui/views/ test targets can use. This means "internal"
headers only used (also) in tests no longer need to be repeated in test
targets inside views/BUILD.gn.

So, declare other targets in views/BUILD.gn as friends, remove those
repeated headers, and mark some things internal.

Start with ui/views/cocoa. Currently 3 headers are used in mac browser
code (for OS-specific fullscreen/native frame, and touchbar things).

Bug: 871123
Change-Id: I5e5a260dd200f1bffc4f6fb8456d6e854fe19c52
Reviewed-on: https://chromium-review.googlesource.com/1163351
Commit-Queue: Trent Apted <tapted@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581062}
parent 7af9ca12
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller_views.h" #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller_views.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "ui/views/cocoa/bridged_content_view.h"
#include "ui/views/cocoa/bridged_native_widget.h" #include "ui/views/cocoa/bridged_native_widget.h"
#include "ui/views/widget/native_widget_mac.h" #include "ui/views/widget/native_widget_mac.h"
......
...@@ -83,18 +83,8 @@ jumbo_component("views") { ...@@ -83,18 +83,8 @@ jumbo_component("views") {
"bubble/info_bubble.h", "bubble/info_bubble.h",
"bubble/tooltip_icon.h", "bubble/tooltip_icon.h",
"button_drag_utils.h", "button_drag_utils.h",
"cocoa/bridged_content_view.h",
"cocoa/bridged_native_widget.h", "cocoa/bridged_native_widget.h",
"cocoa/bridged_native_widget_owner.h",
"cocoa/cocoa_mouse_capture.h",
"cocoa/cocoa_mouse_capture_delegate.h",
"cocoa/cocoa_window_move_loop.h",
"cocoa/drag_drop_client_mac.h",
"cocoa/native_widget_mac_nswindow.h", "cocoa/native_widget_mac_nswindow.h",
"cocoa/tooltip_manager_mac.h",
"cocoa/views_nswindow_delegate.h",
"cocoa/views_scrollbar_bridge.h",
"cocoa/widget_owner_nswindow_adapter.h",
"cocoa/window_touch_bar_delegate.h", "cocoa/window_touch_bar_delegate.h",
"color_chooser/color_chooser_listener.h", "color_chooser/color_chooser_listener.h",
"color_chooser/color_chooser_view.h", "color_chooser/color_chooser_view.h",
...@@ -257,9 +247,9 @@ jumbo_component("views") { ...@@ -257,9 +247,9 @@ jumbo_component("views") {
"window/native_frame_view.h", "window/native_frame_view.h",
"window/non_client_view.h", "window/non_client_view.h",
"window/window_button_order_provider.h", "window/window_button_order_provider.h",
"window/window_resize_utils.h",
"window/window_resources.h", "window/window_resources.h",
"window/window_shape.h", "window/window_shape.h",
"window/window_resize_utils.h",
"word_lookup_client.h", "word_lookup_client.h",
] ]
...@@ -289,17 +279,8 @@ jumbo_component("views") { ...@@ -289,17 +279,8 @@ jumbo_component("views") {
"bubble/info_bubble.cc", "bubble/info_bubble.cc",
"bubble/tooltip_icon.cc", "bubble/tooltip_icon.cc",
"button_drag_utils.cc", "button_drag_utils.cc",
"cocoa/bridged_content_view.mm",
"cocoa/bridged_content_view_touch_bar.mm",
"cocoa/bridged_native_widget.mm", "cocoa/bridged_native_widget.mm",
"cocoa/cocoa_mouse_capture.mm",
"cocoa/cocoa_window_move_loop.mm",
"cocoa/drag_drop_client_mac.mm",
"cocoa/native_widget_mac_nswindow.mm", "cocoa/native_widget_mac_nswindow.mm",
"cocoa/tooltip_manager_mac.mm",
"cocoa/views_nswindow_delegate.mm",
"cocoa/views_scrollbar_bridge.mm",
"cocoa/widget_owner_nswindow_adapter.mm",
"color_chooser/color_chooser_view.cc", "color_chooser/color_chooser_view.cc",
"controls/animated_icon_view.cc", "controls/animated_icon_view.cc",
"controls/button/blue_button.cc", "controls/button/blue_button.cc",
...@@ -444,12 +425,31 @@ jumbo_component("views") { ...@@ -444,12 +425,31 @@ jumbo_component("views") {
"window/window_shape.cc", "window/window_shape.cc",
] ]
# Internal sources. If a header in this list is used by another target under # Other targets in this file (e.g. tests) get access to the internal headers.
# //ui/views:* the header can be listed again in that target's sources. See friend = [ ":*" ]
# http://crbug/com/732993 for a possible build system feature to avoid the
# repetition. TODO(tapted): Move more headers from public into this list with # Internal sources. TODO(https://crbug.com/871123): Move more headers from
# the implementation file. # public into this list, along with the implementation file.
sources += [ sources += [
"cocoa/bridged_content_view.h",
"cocoa/bridged_content_view.mm",
"cocoa/bridged_content_view_touch_bar.mm",
"cocoa/bridged_native_widget_owner.h",
"cocoa/cocoa_mouse_capture.h",
"cocoa/cocoa_mouse_capture.mm",
"cocoa/cocoa_mouse_capture_delegate.h",
"cocoa/cocoa_window_move_loop.h",
"cocoa/cocoa_window_move_loop.mm",
"cocoa/drag_drop_client_mac.h",
"cocoa/drag_drop_client_mac.mm",
"cocoa/tooltip_manager_mac.h",
"cocoa/tooltip_manager_mac.mm",
"cocoa/views_nswindow_delegate.h",
"cocoa/views_nswindow_delegate.mm",
"cocoa/views_scrollbar_bridge.h",
"cocoa/views_scrollbar_bridge.mm",
"cocoa/widget_owner_nswindow_adapter.h",
"cocoa/widget_owner_nswindow_adapter.mm",
"controls/button/label_button_label.cc", "controls/button/label_button_label.cc",
"controls/button/label_button_label.h", "controls/button/label_button_label.h",
] ]
...@@ -919,16 +919,6 @@ jumbo_static_library("test_support") { ...@@ -919,16 +919,6 @@ jumbo_static_library("test_support") {
source_set("views_unittests_sources") { source_set("views_unittests_sources") {
testonly = true testonly = true
# Headers used in tests that appear in :views private sources list. Permits
# this target to act as a "friend" of :views. The build system doesn't
# currently have a way to represent this. See http://crbug.com/732993.
public = [
"controls/button/label_button_label.h",
]
if (has_native_accessibility) {
public += [ "accessibility/view_ax_platform_node_delegate.h" ]
}
sources = [ sources = [
"accessible_pane_view_unittest.cc", "accessible_pane_view_unittest.cc",
"animation/bounds_animator_unittest.cc", "animation/bounds_animator_unittest.cc",
...@@ -1052,8 +1042,6 @@ source_set("views_unittests_sources") { ...@@ -1052,8 +1042,6 @@ source_set("views_unittests_sources") {
] ]
if (is_win) { if (is_win) {
public += [ "accessibility/view_ax_platform_node_delegate_win.h" ]
public_deps += [ public_deps += [
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
"//third_party/iaccessible2", "//third_party/iaccessible2",
......
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