Index: ui/aura/BUILD.gn |
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn |
index 89916f58553c9509ec48c35bd15f94c463f7307e..07c0be682e0321fe863a03226c0b0dfcdba3a81b 100644 |
--- a/ui/aura/BUILD.gn |
+++ b/ui/aura/BUILD.gn |
@@ -6,144 +6,145 @@ import("//build/config/ui.gni") |
import("//testing/test.gni") |
component("aura") { |
- sources = [ |
- "../wm/public/activation_change_observer.cc", |
+ public = [ |
"../wm/public/activation_change_observer.h", |
- "../wm/public/activation_client.cc", |
"../wm/public/activation_client.h", |
- "../wm/public/activation_delegate.cc", |
"../wm/public/activation_delegate.h", |
- "../wm/public/animation_host.cc", |
"../wm/public/animation_host.h", |
- "../wm/public/scoped_drag_drop_disabler.cc", |
"../wm/public/scoped_drag_drop_disabler.h", |
- "../wm/public/scoped_tooltip_disabler.cc", |
"../wm/public/scoped_tooltip_disabler.h", |
- "../wm/public/tooltip_client.cc", |
"../wm/public/tooltip_client.h", |
- "../wm/public/window_move_client.cc", |
"../wm/public/window_move_client.h", |
"../wm/public/window_types.h", |
- "client/aura_constants.cc", |
"client/aura_constants.h", |
- "client/capture_client.cc", |
"client/capture_client.h", |
"client/capture_client_observer.h", |
"client/capture_delegate.h", |
- "client/cursor_client.cc", |
"client/cursor_client.h", |
- "client/cursor_client_observer.cc", |
"client/cursor_client_observer.h", |
- "client/default_capture_client.cc", |
"client/default_capture_client.h", |
- "client/drag_drop_client.cc", |
"client/drag_drop_client.h", |
- "client/drag_drop_delegate.cc", |
"client/drag_drop_delegate.h", |
- "client/event_client.cc", |
"client/event_client.h", |
- "client/focus_change_observer.cc", |
"client/focus_change_observer.h", |
- "client/focus_client.cc", |
"client/focus_client.h", |
- "client/screen_position_client.cc", |
"client/screen_position_client.h", |
- "client/transient_window_client.cc", |
"client/transient_window_client.h", |
"client/transient_window_client_observer.h", |
- "client/visibility_client.cc", |
"client/visibility_client.h", |
- "client/window_parenting_client.cc", |
"client/window_parenting_client.h", |
- "client/window_stacking_client.cc", |
"client/window_stacking_client.h", |
- "env.cc", |
"env.h", |
- "env_input_state_controller.cc", |
"env_input_state_controller.h", |
"env_observer.h", |
- "event_injector.cc", |
"event_injector.h", |
- "input_state_lookup.cc", |
"input_state_lookup.h", |
- "input_state_lookup_win.cc", |
"input_state_lookup_win.h", |
- "layout_manager.cc", |
"layout_manager.h", |
- "local/compositor_frame_sink_local.cc", |
"local/compositor_frame_sink_local.h", |
- "local/window_port_local.cc", |
"local/window_port_local.h", |
- "mus/capture_synchronizer.cc", |
"mus/capture_synchronizer.h", |
"mus/capture_synchronizer_delegate.h", |
- "mus/client_surface_embedder.cc", |
"mus/client_surface_embedder.h", |
"mus/drag_drop_controller_host.h", |
- "mus/drag_drop_controller_mus.cc", |
"mus/drag_drop_controller_mus.h", |
- "mus/focus_synchronizer.cc", |
"mus/focus_synchronizer.h", |
"mus/focus_synchronizer_delegate.h", |
"mus/focus_synchronizer_observer.h", |
- "mus/in_flight_change.cc", |
"mus/in_flight_change.h", |
- "mus/input_method_mus.cc", |
"mus/input_method_mus.h", |
- "mus/mus_context_factory.cc", |
"mus/mus_context_factory.h", |
- "mus/mus_mouse_location_updater.cc", |
"mus/mus_mouse_location_updater.h", |
"mus/mus_types.h", |
- "mus/os_exchange_data_provider_mus.cc", |
"mus/os_exchange_data_provider_mus.h", |
- "mus/property_converter.cc", |
"mus/property_converter.h", |
- "mus/property_utils.cc", |
"mus/property_utils.h", |
- "mus/text_input_client_impl.cc", |
"mus/text_input_client_impl.h", |
- "mus/user_activity_forwarder.cc", |
"mus/user_activity_forwarder.h", |
- "mus/window_manager_delegate.cc", |
"mus/window_manager_delegate.h", |
"mus/window_mus.h", |
- "mus/window_port_mus.cc", |
"mus/window_port_mus.h", |
- "mus/window_tree_client.cc", |
"mus/window_tree_client.h", |
- "mus/window_tree_client_delegate.cc", |
"mus/window_tree_client_delegate.h", |
"mus/window_tree_client_observer.h", |
"mus/window_tree_client_test_observer.h", |
- "mus/window_tree_host_mus.cc", |
"mus/window_tree_host_mus.h", |
"mus/window_tree_host_mus_delegate.h", |
- "mus/window_tree_host_mus_init_params.cc", |
"mus/window_tree_host_mus_init_params.h", |
- "scoped_window_targeter.cc", |
"scoped_window_targeter.h", |
- "window.cc", |
"window.h", |
"window_delegate.h", |
- "window_event_dispatcher.cc", |
"window_event_dispatcher.h", |
- "window_observer.cc", |
"window_observer.h", |
- "window_port.cc", |
"window_port.h", |
- "window_targeter.cc", |
"window_targeter.h", |
"window_tracker.h", |
- "window_tree_host.cc", |
"window_tree_host.h", |
"window_tree_host_mac.h", |
- "window_tree_host_mac.mm", |
"window_tree_host_observer.h", |
- "window_tree_host_platform.cc", |
"window_tree_host_platform.h", |
- "window_tree_host_x11.cc", |
- "window_tree_host_x11.h", |
+ ] |
+ sources = [ |
+ "../wm/public/activation_change_observer.cc", |
+ "../wm/public/activation_client.cc", |
+ "../wm/public/activation_delegate.cc", |
+ "../wm/public/animation_host.cc", |
+ "../wm/public/scoped_drag_drop_disabler.cc", |
+ "../wm/public/scoped_tooltip_disabler.cc", |
+ "../wm/public/tooltip_client.cc", |
+ "../wm/public/window_move_client.cc", |
+ "client/aura_constants.cc", |
+ "client/capture_client.cc", |
+ "client/cursor_client.cc", |
+ "client/cursor_client_observer.cc", |
+ "client/default_capture_client.cc", |
+ "client/drag_drop_client.cc", |
+ "client/drag_drop_delegate.cc", |
+ "client/event_client.cc", |
+ "client/focus_change_observer.cc", |
+ "client/focus_client.cc", |
+ "client/screen_position_client.cc", |
+ "client/transient_window_client.cc", |
+ "client/visibility_client.cc", |
+ "client/window_parenting_client.cc", |
+ "client/window_stacking_client.cc", |
+ "env.cc", |
+ "env_input_state_controller.cc", |
+ "event_injector.cc", |
+ "input_state_lookup.cc", |
+ "input_state_lookup_win.cc", |
+ "layout_manager.cc", |
+ "local/compositor_frame_sink_local.cc", |
+ "local/window_port_local.cc", |
+ "mus/capture_synchronizer.cc", |
+ "mus/client_surface_embedder.cc", |
+ "mus/drag_drop_controller_mus.cc", |
+ "mus/focus_synchronizer.cc", |
+ "mus/in_flight_change.cc", |
+ "mus/input_method_mus.cc", |
+ "mus/mus_context_factory.cc", |
+ "mus/mus_mouse_location_updater.cc", |
+ "mus/os_exchange_data_provider_mus.cc", |
+ "mus/property_converter.cc", |
+ "mus/property_utils.cc", |
+ "mus/text_input_client_impl.cc", |
+ "mus/user_activity_forwarder.cc", |
+ "mus/window_manager_delegate.cc", |
+ "mus/window_port_mus.cc", |
+ "mus/window_tree_client.cc", |
+ "mus/window_tree_client_delegate.cc", |
+ "mus/window_tree_host_mus.cc", |
+ "mus/window_tree_host_mus_init_params.cc", |
+ "scoped_window_targeter.cc", |
+ "window.cc", |
+ "window_event_dispatcher.cc", |
+ "window_observer.cc", |
+ "window_port.cc", |
+ "window_port_for_shutdown.cc", |
+ "window_port_for_shutdown.h", |
+ "window_targeter.cc", |
+ "window_tree_host.cc", |
+ "window_tree_host_platform.cc", |
] |
defines = [ "AURA_IMPLEMENTATION" ] |
@@ -197,11 +198,8 @@ component("aura") { |
"//ui/events/platform/x11", |
"//ui/gfx/x", |
] |
- } else { |
- sources -= [ |
- "window_tree_host_x11.cc", |
- "window_tree_host_x11.h", |
- ] |
+ sources += [ "window_tree_host_x11.cc" ] |
+ public += [ "window_tree_host_x11.h" ] |
} |
if (is_win) { |