Move views::Label DisabledColor logic into views::LabelButtonLabel

ui/views/BUILD.gn

Index: ui/views/BUILD.gn
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 25046754bf7cec1cb5e4ab885a05ab67e02c05a3..50b7c4cb4cf57e4f06ed79ad4d31f2baa04d445a 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -32,375 +32,389 @@ aggregate_vector_icons("views_vector_icons") {
 
 component("views") {
   all_dependent_configs = [ ":flags" ]
-  sources = [
+
+  public = [
     "accessibility/native_view_accessibility.h",
-    "accessible_pane_view.cc",
     "accessible_pane_view.h",
-    "animation/bounds_animator.cc",
     "animation/bounds_animator.h",
     "animation/bounds_animator_observer.h",
-    "animation/flood_fill_ink_drop_ripple.cc",
     "animation/flood_fill_ink_drop_ripple.h",
-    "animation/ink_drop.cc",
     "animation/ink_drop.h",
-    "animation/ink_drop_animation_ended_reason.cc",
     "animation/ink_drop_animation_ended_reason.h",
-    "animation/ink_drop_highlight.cc",
     "animation/ink_drop_highlight.h",
     "animation/ink_drop_highlight_observer.h",
     "animation/ink_drop_host.h",
-    "animation/ink_drop_host_view.cc",
     "animation/ink_drop_host_view.h",
-    "animation/ink_drop_impl.cc",
     "animation/ink_drop_impl.h",
-    "animation/ink_drop_mask.cc",
     "animation/ink_drop_mask.h",
     "animation/ink_drop_observer.h",
-    "animation/ink_drop_painted_layer_delegates.cc",
     "animation/ink_drop_painted_layer_delegates.h",
-    "animation/ink_drop_ripple.cc",
     "animation/ink_drop_ripple.h",
     "animation/ink_drop_ripple_observer.h",
-    "animation/ink_drop_state.cc",
     "animation/ink_drop_state.h",
-    "animation/ink_drop_stub.cc",
     "animation/ink_drop_stub.h",
-    "animation/scroll_animator.cc",
     "animation/scroll_animator.h",
-    "animation/square_ink_drop_ripple.cc",
     "animation/square_ink_drop_ripple.h",
-    "background.cc",
     "background.h",
-    "border.cc",
     "border.h",
-    "bubble/bubble_border.cc",
     "bubble/bubble_border.h",
-    "bubble/bubble_dialog_delegate.cc",
     "bubble/bubble_dialog_delegate.h",
-    "bubble/bubble_frame_view.cc",
     "bubble/bubble_frame_view.h",
-    "bubble/info_bubble.cc",
     "bubble/info_bubble.h",
-    "bubble/tooltip_icon.cc",
     "bubble/tooltip_icon.h",
-    "button_drag_utils.cc",
     "button_drag_utils.h",
     "cocoa/bridged_content_view.h",
-    "cocoa/bridged_content_view.mm",
-    "cocoa/bridged_content_view_touch_bar.mm",
     "cocoa/bridged_native_widget.h",
-    "cocoa/bridged_native_widget.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/native_widget_mac_nswindow.h",
-    "cocoa/native_widget_mac_nswindow.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",
     "color_chooser/color_chooser_listener.h",
-    "color_chooser/color_chooser_view.cc",
     "color_chooser/color_chooser_view.h",
     "context_menu_controller.h",
-    "controls/animated_icon_view.cc",
     "controls/animated_icon_view.h",
-    "controls/button/blue_button.cc",
     "controls/button/blue_button.h",
-    "controls/button/button.cc",
     "controls/button/button.h",
-    "controls/button/checkbox.cc",
     "controls/button/checkbox.h",
-    "controls/button/custom_button.cc",
     "controls/button/custom_button.h",
-    "controls/button/image_button.cc",
     "controls/button/image_button.h",
-    "controls/button/image_button_factory.cc",
     "controls/button/image_button_factory.h",
-    "controls/button/label_button.cc",
     "controls/button/label_button.h",
-    "controls/button/label_button_border.cc",
     "controls/button/label_button_border.h",
-    "controls/button/md_text_button.cc",
     "controls/button/md_text_button.h",
-    "controls/button/menu_button.cc",
     "controls/button/menu_button.h",
     "controls/button/menu_button_listener.h",
-    "controls/button/radio_button.cc",
     "controls/button/radio_button.h",
-    "controls/button/toggle_button.cc",
     "controls/button/toggle_button.h",
-    "controls/combobox/combobox.cc",
     "controls/combobox/combobox.h",
     "controls/combobox/combobox_listener.h",
-    "controls/focus_ring.cc",
     "controls/focus_ring.h",
-    "controls/focusable_border.cc",
     "controls/focusable_border.h",
-    "controls/glow_hover_controller.cc",
     "controls/glow_hover_controller.h",
-    "controls/image_view.cc",
     "controls/image_view.h",
-    "controls/label.cc",
     "controls/label.h",
-    "controls/link.cc",
     "controls/link.h",
     "controls/link_listener.h",
-    "controls/menu/display_change_listener_mac.cc",
-    "controls/menu/menu_config.cc",
     "controls/menu/menu_config.h",
-    "controls/menu/menu_config_chromeos.cc",
-    "controls/menu/menu_config_linux.cc",
-    "controls/menu/menu_config_mac.mm",
-    "controls/menu/menu_config_win.cc",
-    "controls/menu/menu_controller.cc",
     "controls/menu/menu_controller.h",
     "controls/menu/menu_controller_delegate.h",
-    "controls/menu/menu_delegate.cc",
     "controls/menu/menu_delegate.h",
-    "controls/menu/menu_host.cc",
     "controls/menu/menu_host.h",
-    "controls/menu/menu_host_root_view.cc",
     "controls/menu/menu_host_root_view.h",
-    "controls/menu/menu_image_util.cc",
     "controls/menu/menu_image_util.h",
     "controls/menu/menu_insertion_delegate_win.h",
-    "controls/menu/menu_item_view.cc",
     "controls/menu/menu_item_view.h",
-    "controls/menu/menu_listener.cc",
     "controls/menu/menu_listener.h",
-    "controls/menu/menu_model_adapter.cc",
     "controls/menu/menu_model_adapter.h",
-    "controls/menu/menu_runner.cc",
     "controls/menu/menu_runner.h",
     "controls/menu/menu_runner_handler.h",
-    "controls/menu/menu_runner_impl.cc",
     "controls/menu/menu_runner_impl.h",
-    "controls/menu/menu_runner_impl_adapter.cc",
     "controls/menu/menu_runner_impl_adapter.h",
     "controls/menu/menu_runner_impl_cocoa.h",
-    "controls/menu/menu_runner_impl_cocoa.mm",
     "controls/menu/menu_runner_impl_interface.h",
-    "controls/menu/menu_scroll_view_container.cc",
     "controls/menu/menu_scroll_view_container.h",
-    "controls/menu/menu_separator.cc",
     "controls/menu/menu_separator.h",
     "controls/menu/menu_types.h",
-    "controls/menu/native_menu_win.cc",
     "controls/menu/native_menu_win.h",
-    "controls/menu/submenu_view.cc",
     "controls/menu/submenu_view.h",
-    "controls/message_box_view.cc",
     "controls/message_box_view.h",
-    "controls/native/native_view_host.cc",
     "controls/native/native_view_host.h",
     "controls/native/native_view_host_mac.h",
-    "controls/native/native_view_host_mac.mm",
     "controls/native/native_view_host_wrapper.h",
     "controls/prefix_delegate.h",
-    "controls/prefix_selector.cc",
     "controls/prefix_selector.h",
-    "controls/progress_bar.cc",
     "controls/progress_bar.h",
-    "controls/resize_area.cc",
     "controls/resize_area.h",
     "controls/resize_area_delegate.h",
-    "controls/scroll_view.cc",
     "controls/scroll_view.h",
-    "controls/scrollbar/base_scroll_bar.cc",
     "controls/scrollbar/base_scroll_bar.h",
-    "controls/scrollbar/base_scroll_bar_button.cc",
     "controls/scrollbar/base_scroll_bar_button.h",
-    "controls/scrollbar/base_scroll_bar_thumb.cc",
     "controls/scrollbar/base_scroll_bar_thumb.h",
     "controls/scrollbar/cocoa_scroll_bar.h",
-    "controls/scrollbar/cocoa_scroll_bar.mm",
-    "controls/scrollbar/overlay_scroll_bar.cc",
     "controls/scrollbar/overlay_scroll_bar.h",
-    "controls/scrollbar/scroll_bar.cc",
     "controls/scrollbar/scroll_bar.h",
-    "controls/scrollbar/scroll_bar_views.cc",
     "controls/scrollbar/scroll_bar_views.h",
-    "controls/separator.cc",
     "controls/separator.h",
-    "controls/slider.cc",
     "controls/slider.h",
-    "controls/styled_label.cc",
     "controls/styled_label.h",
     "controls/styled_label_listener.h",
-    "controls/tabbed_pane/tabbed_pane.cc",
     "controls/tabbed_pane/tabbed_pane.h",
     "controls/tabbed_pane/tabbed_pane_listener.h",
     "controls/table/table_grouper.h",
-    "controls/table/table_header.cc",
     "controls/table/table_header.h",
-    "controls/table/table_utils.cc",
     "controls/table/table_utils.h",
-    "controls/table/table_view.cc",
     "controls/table/table_view.h",
     "controls/table/table_view_observer.h",
-    "controls/textfield/textfield.cc",
     "controls/textfield/textfield.h",
-    "controls/textfield/textfield_controller.cc",
     "controls/textfield/textfield_controller.h",
-    "controls/textfield/textfield_model.cc",
     "controls/textfield/textfield_model.h",
-    "controls/throbber.cc",
     "controls/throbber.h",
-    "controls/tree/tree_view.cc",
     "controls/tree/tree_view.h",
-    "controls/tree/tree_view_controller.cc",
     "controls/tree/tree_view_controller.h",
-    "debug_utils.cc",
     "debug_utils.h",
     "drag_controller.h",
-    "drag_utils.cc",
     "drag_utils.h",
-    "drag_utils_mac.mm",
     "event_monitor.h",
     "event_monitor_mac.h",
-    "event_monitor_mac.mm",
-    "focus/external_focus_tracker.cc",
     "focus/external_focus_tracker.h",
-    "focus/focus_manager.cc",
     "focus/focus_manager.h",
     "focus/focus_manager_delegate.h",
-    "focus/focus_manager_factory.cc",
     "focus/focus_manager_factory.h",
-    "focus/focus_search.cc",
     "focus/focus_search.h",
-    "focus/widget_focus_manager.cc",
     "focus/widget_focus_manager.h",
-    "layout/box_layout.cc",
     "layout/box_layout.h",
-    "layout/fill_layout.cc",
     "layout/fill_layout.h",
-    "layout/grid_layout.cc",
     "layout/grid_layout.h",
-    "layout/layout_manager.cc",
     "layout/layout_manager.h",
-    "layout/layout_provider.cc",
     "layout/layout_provider.h",
-    "linux_ui/linux_ui.cc",
     "linux_ui/linux_ui.h",
-    "linux_ui/status_icon_linux.cc",
     "linux_ui/status_icon_linux.h",
     "linux_ui/window_button_order_observer.h",
-    "linux_ui/window_button_order_provider.cc",
-    "masked_targeter_delegate.cc",
     "masked_targeter_delegate.h",
-    "metrics.cc",
     "metrics.h",
-    "metrics_mac.cc",
     "mouse_constants.h",
-    "mouse_watcher.cc",
     "mouse_watcher.h",
-    "mouse_watcher_view_host.cc",
     "mouse_watcher_view_host.h",
     "native_cursor.h",
-    "native_cursor_mac.mm",
     "native_theme_delegate.h",
-    "painter.cc",
     "painter.h",
     "pointer_watcher.h",
-    "rect_based_targeting_utils.cc",
     "rect_based_targeting_utils.h",
-    "repeat_controller.cc",
     "repeat_controller.h",
-    "round_rect_painter.cc",
     "round_rect_painter.h",
-    "selection_controller.cc",
     "selection_controller.h",
     "selection_controller_delegate.h",
-    "shadow_border.cc",
     "shadow_border.h",
-    "style/platform_style.cc",
     "style/platform_style.h",
-    "style/platform_style_mac.mm",
-    "style/typography.cc",
     "style/typography.h",
-    "style/typography_provider.cc",
     "style/typography_provider.h",
-    "view.cc",
     "view.h",
-    "view_constants.cc",
     "view_constants.h",
-    "view_model.cc",
     "view_model.h",
-    "view_model_utils.cc",
     "view_model_utils.h",
     "view_observer.h",
-    "view_properties.cc",
     "view_properties.h",
-    "view_targeter.cc",
     "view_targeter.h",
-    "view_targeter_delegate.cc",
     "view_targeter_delegate.h",
-    "view_tracker.cc",
     "view_tracker.h",
-    "views_delegate.cc",
     "views_delegate.h",
     "views_export.h",
-    "views_exports.cc",
-    "views_switches.cc",
     "views_switches.h",
     "views_touch_selection_controller_factory.h",
-    "views_touch_selection_controller_factory_mac.cc",
-    "widget/drop_helper.cc",
     "widget/drop_helper.h",
     "widget/native_widget.h",
     "widget/native_widget_delegate.h",
     "widget/native_widget_mac.h",
-    "widget/native_widget_mac.mm",
     "widget/native_widget_private.h",
-    "widget/root_view.cc",
     "widget/root_view.h",
-    "widget/root_view_targeter.cc",
     "widget/root_view_targeter.h",
-    "widget/tooltip_manager.cc",
     "widget/tooltip_manager.h",
-    "widget/widget.cc",
     "widget/widget.h",
-    "widget/widget_aura_utils.cc",
     "widget/widget_aura_utils.h",
-    "widget/widget_delegate.cc",
     "widget/widget_delegate.h",
-    "widget/widget_deletion_observer.cc",
     "widget/widget_deletion_observer.h",
     "widget/widget_observer.h",
     "widget/widget_removals_observer.h",
-    "window/client_view.cc",
     "window/client_view.h",
-    "window/custom_frame_view.cc",
     "window/custom_frame_view.h",
-    "window/dialog_client_view.cc",
     "window/dialog_client_view.h",
-    "window/dialog_delegate.cc",
     "window/dialog_delegate.h",
-    "window/frame_background.cc",
     "window/frame_background.h",
     "window/frame_buttons.h",
-    "window/native_frame_view.cc",
     "window/native_frame_view.h",
-    "window/non_client_view.cc",
     "window/non_client_view.h",
-    "window/window_button_order_provider.cc",
     "window/window_button_order_provider.h",
     "window/window_resources.h",
-    "window/window_shape.cc",
     "window/window_shape.h",
     "word_lookup_client.h",
   ]
 
+  sources = [
+    "accessible_pane_view.cc",
+    "animation/bounds_animator.cc",
+    "animation/flood_fill_ink_drop_ripple.cc",
+    "animation/ink_drop.cc",
+    "animation/ink_drop_animation_ended_reason.cc",
+    "animation/ink_drop_highlight.cc",
+    "animation/ink_drop_host_view.cc",
+    "animation/ink_drop_impl.cc",
+    "animation/ink_drop_mask.cc",
+    "animation/ink_drop_painted_layer_delegates.cc",
+    "animation/ink_drop_ripple.cc",
+    "animation/ink_drop_state.cc",
+    "animation/ink_drop_stub.cc",
+    "animation/scroll_animator.cc",
+    "animation/square_ink_drop_ripple.cc",
+    "background.cc",
+    "border.cc",
+    "bubble/bubble_border.cc",
+    "bubble/bubble_dialog_delegate.cc",
+    "bubble/bubble_frame_view.cc",
+    "bubble/info_bubble.cc",
+    "bubble/tooltip_icon.cc",
+    "button_drag_utils.cc",
+    "cocoa/bridged_content_view.mm",
+    "cocoa/bridged_content_view_touch_bar.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/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",
+    "controls/animated_icon_view.cc",
+    "controls/button/blue_button.cc",
+    "controls/button/button.cc",
+    "controls/button/checkbox.cc",
+    "controls/button/custom_button.cc",
+    "controls/button/image_button.cc",
+    "controls/button/image_button_factory.cc",
+    "controls/button/label_button.cc",
+    "controls/button/label_button_border.cc",
+    "controls/button/md_text_button.cc",
+    "controls/button/menu_button.cc",
+    "controls/button/radio_button.cc",
+    "controls/button/toggle_button.cc",
+    "controls/combobox/combobox.cc",
+    "controls/focus_ring.cc",
+    "controls/focusable_border.cc",
+    "controls/glow_hover_controller.cc",
+    "controls/image_view.cc",
+    "controls/label.cc",
+    "controls/link.cc",
+    "controls/menu/display_change_listener_mac.cc",
+    "controls/menu/menu_config.cc",
+    "controls/menu/menu_config_chromeos.cc",
+    "controls/menu/menu_config_linux.cc",
+    "controls/menu/menu_config_mac.mm",
+    "controls/menu/menu_config_win.cc",
+    "controls/menu/menu_controller.cc",
+    "controls/menu/menu_delegate.cc",
+    "controls/menu/menu_host.cc",
+    "controls/menu/menu_host_root_view.cc",
+    "controls/menu/menu_image_util.cc",
+    "controls/menu/menu_item_view.cc",
+    "controls/menu/menu_listener.cc",
+    "controls/menu/menu_model_adapter.cc",
+    "controls/menu/menu_runner.cc",
+    "controls/menu/menu_runner_impl.cc",
+    "controls/menu/menu_runner_impl_adapter.cc",
+    "controls/menu/menu_runner_impl_cocoa.mm",
+    "controls/menu/menu_scroll_view_container.cc",
+    "controls/menu/menu_separator.cc",
+    "controls/menu/native_menu_win.cc",
+    "controls/menu/submenu_view.cc",
+    "controls/message_box_view.cc",
+    "controls/native/native_view_host.cc",
+    "controls/native/native_view_host_mac.mm",
+    "controls/prefix_selector.cc",
+    "controls/progress_bar.cc",
+    "controls/resize_area.cc",
+    "controls/scroll_view.cc",
+    "controls/scrollbar/base_scroll_bar.cc",
+    "controls/scrollbar/base_scroll_bar_button.cc",
+    "controls/scrollbar/base_scroll_bar_thumb.cc",
+    "controls/scrollbar/cocoa_scroll_bar.mm",
+    "controls/scrollbar/overlay_scroll_bar.cc",
+    "controls/scrollbar/scroll_bar.cc",
+    "controls/scrollbar/scroll_bar_views.cc",
+    "controls/separator.cc",
+    "controls/slider.cc",
+    "controls/styled_label.cc",
+    "controls/tabbed_pane/tabbed_pane.cc",
+    "controls/table/table_header.cc",
+    "controls/table/table_utils.cc",
+    "controls/table/table_view.cc",
+    "controls/textfield/textfield.cc",
+    "controls/textfield/textfield_controller.cc",
+    "controls/textfield/textfield_model.cc",
+    "controls/throbber.cc",
+    "controls/tree/tree_view.cc",
+    "controls/tree/tree_view_controller.cc",
+    "debug_utils.cc",
+    "drag_utils.cc",
+    "drag_utils_mac.mm",
+    "event_monitor_mac.mm",
+    "focus/external_focus_tracker.cc",
+    "focus/focus_manager.cc",
+    "focus/focus_manager_factory.cc",
+    "focus/focus_search.cc",
+    "focus/widget_focus_manager.cc",
+    "layout/box_layout.cc",
+    "layout/fill_layout.cc",
+    "layout/grid_layout.cc",
+    "layout/layout_manager.cc",
+    "layout/layout_provider.cc",
+    "linux_ui/linux_ui.cc",
+    "linux_ui/status_icon_linux.cc",
+    "linux_ui/window_button_order_provider.cc",
+    "masked_targeter_delegate.cc",
+    "metrics.cc",
+    "metrics_mac.cc",
+    "mouse_watcher.cc",
+    "mouse_watcher_view_host.cc",
+    "native_cursor_mac.mm",
+    "painter.cc",
+    "rect_based_targeting_utils.cc",
+    "repeat_controller.cc",
+    "round_rect_painter.cc",
+    "selection_controller.cc",
+    "shadow_border.cc",
+    "style/platform_style.cc",
+    "style/platform_style_mac.mm",
+    "style/typography.cc",
+    "style/typography_provider.cc",
+    "view.cc",
+    "view_constants.cc",
+    "view_model.cc",
+    "view_model_utils.cc",
+    "view_properties.cc",
+    "view_targeter.cc",
+    "view_targeter_delegate.cc",
+    "view_tracker.cc",
+    "views_delegate.cc",
+    "views_exports.cc",
+    "views_switches.cc",
+    "views_touch_selection_controller_factory_mac.cc",
+    "widget/drop_helper.cc",
+    "widget/native_widget_mac.mm",
+    "widget/root_view.cc",
+    "widget/root_view_targeter.cc",
+    "widget/tooltip_manager.cc",
+    "widget/widget.cc",
+    "widget/widget_aura_utils.cc",
+    "widget/widget_delegate.cc",
+    "widget/widget_deletion_observer.cc",
+    "window/client_view.cc",
+    "window/custom_frame_view.cc",
+    "window/dialog_client_view.cc",
+    "window/dialog_delegate.cc",
+    "window/frame_background.cc",
+    "window/native_frame_view.cc",
+    "window/non_client_view.cc",
+    "window/window_button_order_provider.cc",
+    "window/window_shape.cc",
+  ]
+
+  # Internal sources. If a header in this list is used by another target under
+  # //ui/views:* the header can be listed again in that target's sources. See
+  # 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
+  # the implementation file.
+  sources += [
+    "controls/button/label_button_label.cc",
+    "controls/button/label_button_label.h",
+  ]
+
   sources += get_target_outputs(":views_vector_icons")
 
   configs += [
@@ -413,7 +427,6 @@ component("views") {
   defines = [ "VIEWS_IMPLEMENTATION" ]
 
   deps = [
-    ":views_vector_icons",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//cc/paint",
@@ -431,6 +444,7 @@ component("views") {
   ]
 
   public_deps = [
+    ":views_vector_icons",

[tapted, 2017/06/21 10:33:18]

(copied from patchset 10)
I had to move this.. but for generated headers this is often the right place
anyway

ui/views/vector_icons.h is added by

sources += get_target_outputs(":views_vector_icons")

adding a public =[] list means that it's not usable by dependants and gn check
fails in a bunch of places. But just adding `vector_icons.h` to the public =[]
list causes a different error in check_gn_headers.py, saying it should be
removed:

"""Running ['/usr/bin/python', '/b/c/b/linux/src/build/check_gn_headers.py',
'--out-dir', u'/b/c/b/linux/src/out/Release', '--whitelist',
'/b/c/b/linux/src/build/check_gn_headers_whitelist.txt', '--json',
'/tmp/tmpsQjx3x', '--verbose'] in '/b/c/b/linux/src' (env: None)
The following non-existing files should be removed from gn files:
ui/views/vector_icons.h
"""

Hence, this.

     "//base",
     "//ui/accessibility:ax_gen",
     "//ui/base",
@@ -454,38 +468,42 @@ component("views") {
     sources -= [ "window/window_button_order_provider.cc" ]
     deps += [ "//ui/shell_dialogs" ]
   } else {
-    sources -= [
-      "linux_ui/linux_ui.cc",
+    public -= [
       "linux_ui/linux_ui.h",
       "linux_ui/window_button_order_observer.h",
+    ]

[tapted, 2017/06/21 10:33:17]

(copied from patchset 10) not sure whether it's necessary to maintain removals
from `public` this way.
I've gone for consistency for now.

+    sources -= [
+      "linux_ui/linux_ui.cc",
       "linux_ui/window_button_order_provider.cc",
     ]
   }
 
   if (is_chromeos) {
+    public -= [ "linux_ui/status_icon_linux.h" ]
     sources -= [
       "controls/menu/menu_config_linux.cc",
       "linux_ui/status_icon_linux.cc",
-      "linux_ui/status_icon_linux.h",
     ]
     sources += [ "widget/desktop_aura/desktop_window_tree_host_chromeos.cc" ]
   }
 
   if (is_win) {
-    sources += [
-      "widget/widget_hwnd_utils.cc",
+    public += [
       "widget/widget_hwnd_utils.h",
-      "win/fullscreen_handler.cc",
       "win/fullscreen_handler.h",
-      "win/hwnd_message_handler.cc",
       "win/hwnd_message_handler.h",
       "win/hwnd_message_handler_delegate.h",
       "win/hwnd_util.h",
+      "win/scoped_fullscreen_visibility.h",
+      "win/windows_session_change_observer.h",
+    ]
+    sources += [
+      "widget/widget_hwnd_utils.cc",
+      "win/fullscreen_handler.cc",
+      "win/hwnd_message_handler.cc",
       "win/hwnd_util_aurawin.cc",
       "win/scoped_fullscreen_visibility.cc",
-      "win/scoped_fullscreen_visibility.h",
       "win/windows_session_change_observer.cc",
-      "win/windows_session_change_observer.h",
     ]
     libs = [
       "dwmapi.lib",
@@ -517,71 +535,73 @@ component("views") {
   }
 
   if (use_aura) {
+    public += [
+      "accessibility/ax_aura_obj_cache.h",
+      "accessibility/ax_aura_obj_wrapper.h",
+      "accessibility/ax_view_obj_wrapper.h",
+      "accessibility/ax_widget_obj_wrapper.h",
+      "accessibility/ax_window_obj_wrapper.h",
+      "bubble/bubble_window_targeter.h",
+      "bubble/tray_bubble_view.h",
+      "controls/menu/menu_pre_target_handler.h",
+      "controls/native/native_view_host_aura.h",
+      "corewm/cursor_height_provider_win.h",
+      "corewm/tooltip.h",
+      "corewm/tooltip_aura.h",
+      "corewm/tooltip_controller.h",
+      "corewm/tooltip_win.h",
+      "event_monitor_aura.h",
+      "touchui/touch_selection_controller_impl.h",
+      "touchui/touch_selection_menu_runner_views.h",
+      "view_constants_aura.h",
+      "widget/desktop_aura/desktop_capture_client.h",
+      "widget/desktop_aura/desktop_drop_target_win.h",
+      "widget/desktop_aura/desktop_event_client.h",
+      "widget/desktop_aura/desktop_focus_rules.h",
+      "widget/desktop_aura/desktop_native_cursor_manager.h",
+      "widget/desktop_aura/desktop_native_widget_aura.h",
+      "widget/desktop_aura/desktop_screen.h",
+      "widget/desktop_aura/desktop_screen_position_client.h",
+      "widget/desktop_aura/desktop_window_tree_host.h",
+      "widget/focus_manager_event_handler.h",
+      "widget/native_widget_aura.h",
+      "widget/tooltip_manager_aura.h",
+      "widget/window_reorderer.h",
+    ]
     sources += [
       "accessibility/ax_aura_obj_cache.cc",
-      "accessibility/ax_aura_obj_cache.h",
       "accessibility/ax_aura_obj_wrapper.cc",
-      "accessibility/ax_aura_obj_wrapper.h",
       "accessibility/ax_view_obj_wrapper.cc",
-      "accessibility/ax_view_obj_wrapper.h",
       "accessibility/ax_widget_obj_wrapper.cc",
-      "accessibility/ax_widget_obj_wrapper.h",
       "accessibility/ax_window_obj_wrapper.cc",
-      "accessibility/ax_window_obj_wrapper.h",
       "bubble/bubble_window_targeter.cc",
-      "bubble/bubble_window_targeter.h",
       "bubble/tray_bubble_view.cc",
-      "bubble/tray_bubble_view.h",
       "controls/menu/display_change_listener_aura.cc",
       "controls/menu/menu_pre_target_handler.cc",
-      "controls/menu/menu_pre_target_handler.h",
       "controls/native/native_view_host_aura.cc",
-      "controls/native/native_view_host_aura.h",
       "corewm/cursor_height_provider_win.cc",
-      "corewm/cursor_height_provider_win.h",
-      "corewm/tooltip.h",
       "corewm/tooltip_aura.cc",
-      "corewm/tooltip_aura.h",
       "corewm/tooltip_controller.cc",
-      "corewm/tooltip_controller.h",
       "corewm/tooltip_win.cc",
-      "corewm/tooltip_win.h",
       "drag_utils_aura.cc",
       "event_monitor_aura.cc",
-      "event_monitor_aura.h",
       "metrics_aura.cc",
       "native_cursor_aura.cc",
       "touchui/touch_selection_controller_impl.cc",
-      "touchui/touch_selection_controller_impl.h",
       "touchui/touch_selection_menu_runner_views.cc",
-      "touchui/touch_selection_menu_runner_views.h",
       "view_constants_aura.cc",
-      "view_constants_aura.h",
       "views_touch_selection_controller_factory_aura.cc",
       "widget/desktop_aura/desktop_capture_client.cc",
-      "widget/desktop_aura/desktop_capture_client.h",
       "widget/desktop_aura/desktop_drop_target_win.cc",
-      "widget/desktop_aura/desktop_drop_target_win.h",
       "widget/desktop_aura/desktop_event_client.cc",
-      "widget/desktop_aura/desktop_event_client.h",
       "widget/desktop_aura/desktop_focus_rules.cc",
-      "widget/desktop_aura/desktop_focus_rules.h",
       "widget/desktop_aura/desktop_native_cursor_manager.cc",
-      "widget/desktop_aura/desktop_native_cursor_manager.h",
       "widget/desktop_aura/desktop_native_widget_aura.cc",
-      "widget/desktop_aura/desktop_native_widget_aura.h",
-      "widget/desktop_aura/desktop_screen.h",
       "widget/desktop_aura/desktop_screen_position_client.cc",
-      "widget/desktop_aura/desktop_screen_position_client.h",
-      "widget/desktop_aura/desktop_window_tree_host.h",
       "widget/focus_manager_event_handler.cc",
-      "widget/focus_manager_event_handler.h",
       "widget/native_widget_aura.cc",
-      "widget/native_widget_aura.h",
       "widget/tooltip_manager_aura.cc",
-      "widget/tooltip_manager_aura.h",
       "widget/window_reorderer.cc",
-      "widget/window_reorderer.h",
     ]
     deps += [
       "//services/ui/public/interfaces",
@@ -592,30 +612,32 @@ component("views") {
     ]
     if (!is_chromeos) {
       if (use_x11) {
-        sources += [
-          "widget/desktop_aura/desktop_drag_drop_client_aurax11.cc",
+        public += [
           "widget/desktop_aura/desktop_drag_drop_client_aurax11.h",
-          "widget/desktop_aura/desktop_screen_x11.cc",
           "widget/desktop_aura/desktop_screen_x11.h",
           "widget/desktop_aura/desktop_window_tree_host_observer_x11.h",
-          "widget/desktop_aura/desktop_window_tree_host_x11.cc",
           "widget/desktop_aura/desktop_window_tree_host_x11.h",
-          "widget/desktop_aura/x11_desktop_handler.cc",
           "widget/desktop_aura/x11_desktop_handler.h",
           "widget/desktop_aura/x11_desktop_handler_observer.h",
-          "widget/desktop_aura/x11_desktop_window_move_client.cc",
           "widget/desktop_aura/x11_desktop_window_move_client.h",
           "widget/desktop_aura/x11_move_loop.h",
           "widget/desktop_aura/x11_move_loop_delegate.h",
-          "widget/desktop_aura/x11_pointer_grab.cc",
           "widget/desktop_aura/x11_pointer_grab.h",
-          "widget/desktop_aura/x11_topmost_window_finder.cc",
           "widget/desktop_aura/x11_topmost_window_finder.h",
-          "widget/desktop_aura/x11_whole_screen_move_loop.cc",
           "widget/desktop_aura/x11_whole_screen_move_loop.h",
-          "widget/desktop_aura/x11_window_event_filter.cc",
           "widget/desktop_aura/x11_window_event_filter.h",
         ]
+        sources += [
+          "widget/desktop_aura/desktop_drag_drop_client_aurax11.cc",
+          "widget/desktop_aura/desktop_screen_x11.cc",
+          "widget/desktop_aura/desktop_window_tree_host_x11.cc",
+          "widget/desktop_aura/x11_desktop_handler.cc",
+          "widget/desktop_aura/x11_desktop_window_move_client.cc",
+          "widget/desktop_aura/x11_pointer_grab.cc",
+          "widget/desktop_aura/x11_topmost_window_finder.cc",
+          "widget/desktop_aura/x11_whole_screen_move_loop.cc",
+          "widget/desktop_aura/x11_window_event_filter.cc",
+        ]
         if (use_atk) {
           sources += [
             "accessibility/native_view_accessibility_auralinux.cc",
@@ -835,6 +857,17 @@ static_library("test_support") {
 # and views_mus_unittests.
 source_set("views_unittests_sources") {
   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/native_view_accessibility_base.h" ]
+  }
+
   sources = [
     "accessibility/native_view_accessibility_win_unittest.cc",
     "accessible_pane_view_unittest.cc",
@@ -858,6 +891,7 @@ source_set("views_unittests_sources") {
     "controls/button/custom_button_unittest.cc",
     "controls/button/image_button_factory_unittest.cc",
     "controls/button/image_button_unittest.cc",
+    "controls/button/label_button_label_unittest.cc",
     "controls/button/label_button_unittest.cc",
     "controls/button/menu_button_unittest.cc",
     "controls/button/toggle_button_unittest.cc",
@@ -917,6 +951,7 @@ source_set("views_unittests_sources") {
   # views_mus_unittests will get them.
   public_deps = [
     ":test_support",
+    ":views",
     "//base",
     "//base:i18n",
     "//base/test:test_support",