Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2762)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/BUILD.gn

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WATCHLISTS ('k') | ash/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 88736fa0a5c9a0dabcb9203fc40f0d84ccdc22bd..e385c47283584252fedf9e6477de6671ba3a945b 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -42,8 +42,6 @@ component("ash") {
"accelerators/magnifier_key_scroller.h",
"accelerators/spoken_feedback_toggler.cc",
"accelerators/spoken_feedback_toggler.h",
- "accessibility_delegate.h",
- "accessibility_types.h",
"animation/animation_change_type.h",
"app_list/app_list_delegate_impl.cc",
"app_list/app_list_delegate_impl.h",
@@ -51,13 +49,7 @@ component("ash") {
"app_list/app_list_presenter_delegate.h",
"app_list/app_list_presenter_delegate_factory.cc",
"app_list/app_list_presenter_delegate_factory.h",
- "ash_constants.cc",
- "ash_constants.h",
"ash_export.h",
- "ash_layout_constants.cc",
- "ash_layout_constants.h",
- "ash_switches.cc",
- "ash_switches.h",
"ash_touch_exploration_manager_chromeos.cc",
"ash_touch_exploration_manager_chromeos.h",
"aura/aura_layout_manager_adapter.cc",
@@ -72,18 +64,76 @@ component("ash") {
"autoclick/autoclick_controller.h",
"cancel_mode.cc",
"cancel_mode.h",
- "cast_config_controller.cc",
- "cast_config_controller.h",
+ "common/accessibility_delegate.h",
+ "common/accessibility_types.h",
+ "common/ash_constants.cc",
+ "common/ash_constants.h",
+ "common/ash_layout_constants.cc",
+ "common/ash_layout_constants.h",
+ "common/ash_switches.cc",
+ "common/ash_switches.h",
+ "common/cast_config_controller.cc",
+ "common/cast_config_controller.h",
+ "common/default_accessibility_delegate.cc",
+ "common/default_accessibility_delegate.h",
+ "common/devtools/ash_devtools_css_agent.cc",
+ "common/devtools/ash_devtools_css_agent.h",
+ "common/devtools/ash_devtools_dom_agent.cc",
+ "common/devtools/ash_devtools_dom_agent.h",
+ "common/focus_cycler.cc",
+ "common/focus_cycler.h",
+ "common/gpu_support.h",
+ "common/gpu_support_stub.cc",
+ "common/gpu_support_stub.h",
+ "common/key_event_watcher.cc",
+ "common/key_event_watcher.h",
+ "common/keyboard/keyboard_ui.cc",
+ "common/keyboard/keyboard_ui.h",
+ "common/keyboard/keyboard_ui_observer.h",
+ "common/login_status.h",
+ "common/material_design/material_design_controller.cc",
+ "common/material_design/material_design_controller.h",
+ "common/media_controller.cc",
+ "common/media_controller.h",
+ "common/mojo_interface_factory.cc",
+ "common/mojo_interface_factory.h",
+ "common/multi_profile_uma.cc",
+ "common/multi_profile_uma.h",
+ "common/new_window_controller.cc",
+ "common/new_window_controller.h",
+ "common/palette_delegate.h",
+ "common/scoped_root_window_for_new_windows.cc",
+ "common/scoped_root_window_for_new_windows.h",
+ "common/session/session_controller.cc",
+ "common/session/session_controller.h",
+ "common/session/session_state_delegate.cc",
+ "common/session/session_state_delegate.h",
+ "common/session/session_state_observer.cc",
+ "common/session/session_state_observer.h",
+ "common/shell_delegate.h",
+ "common/shutdown_controller.cc",
+ "common/shutdown_controller.h",
+ "common/wallpaper/wallpaper_controller.cc",
+ "common/wallpaper/wallpaper_controller.h",
+ "common/wallpaper/wallpaper_controller_observer.h",
+ "common/wallpaper/wallpaper_delegate.h",
+ "common/wallpaper/wallpaper_view.cc",
+ "common/wallpaper/wallpaper_view.h",
+ "common/wallpaper/wallpaper_widget_controller.cc",
+ "common/wallpaper/wallpaper_widget_controller.h",
+ "common/wm_activation_observer.h",
+ "common/wm_display_observer.h",
+ "common/wm_layout_manager.h",
+ "common/wm_shell.cc",
+ "common/wm_shell.h",
+ "common/wm_transient_window_observer.h",
+ "common/wm_window.cc",
+ "common/wm_window.h",
+ "common/wm_window_user_data.h",
"debug.cc",
"debug.h",
- "default_accessibility_delegate.cc",
- "default_accessibility_delegate.h",
"default_wallpaper_delegate.cc",
"default_wallpaper_delegate.h",
- "devtools/ash_devtools_css_agent.cc",
- "devtools/ash_devtools_css_agent.h",
- "devtools/ash_devtools_dom_agent.cc",
- "devtools/ash_devtools_dom_agent.h",
"display/cursor_window_controller.cc",
"display/cursor_window_controller.h",
"display/display_animator.h",
@@ -143,8 +193,6 @@ component("ash") {
"first_run/first_run_helper.h",
"first_run/first_run_helper_impl.cc",
"first_run/first_run_helper_impl.h",
- "focus_cycler.cc",
- "focus_cycler.h",
"frame/caption_buttons/caption_button_types.h",
"frame/caption_buttons/frame_caption_button.cc",
"frame/caption_buttons/frame_caption_button.h",
@@ -164,9 +212,6 @@ component("ash") {
"frame/header_painter_util.h",
"frame/header_view.cc",
"frame/header_view.h",
- "gpu_support.h",
- "gpu_support_stub.cc",
- "gpu_support_stub.h",
"high_contrast/high_contrast_controller.cc",
"high_contrast/high_contrast_controller.h",
"host/ash_window_tree_host.cc",
@@ -183,11 +228,6 @@ component("ash") {
"host/transformer_helper.h",
"ime/input_method_event_handler.cc",
"ime/input_method_event_handler.h",
- "key_event_watcher.cc",
- "key_event_watcher.h",
- "keyboard/keyboard_ui.cc",
- "keyboard/keyboard_ui.h",
- "keyboard/keyboard_ui_observer.h",
"laser/laser_pointer_controller.cc",
"laser/laser_pointer_controller.h",
"laser/laser_pointer_points.cc",
@@ -200,15 +240,10 @@ component("ash") {
"link_handler_model.h",
"link_handler_model_factory.cc",
"link_handler_model_factory.h",
- "login_status.h",
"magnifier/magnification_controller.cc",
"magnifier/magnification_controller.h",
"magnifier/partial_magnification_controller.cc",
"magnifier/partial_magnification_controller.h",
- "material_design/material_design_controller.cc",
- "material_design/material_design_controller.h",
- "media_controller.cc",
- "media_controller.h",
"metrics/desktop_task_switch_metric_recorder.cc",
"metrics/desktop_task_switch_metric_recorder.h",
"metrics/gesture_action_type.h",
@@ -221,13 +256,6 @@ component("ash") {
"metrics/user_metrics_action.h",
"metrics/user_metrics_recorder.cc",
"metrics/user_metrics_recorder.h",
- "mojo_interface_factory.cc",
- "mojo_interface_factory.h",
- "multi_profile_uma.cc",
- "multi_profile_uma.h",
- "new_window_controller.cc",
- "new_window_controller.h",
- "palette_delegate.h",
"root_window_controller.cc",
"root_window_controller.h",
"root_window_settings.cc",
@@ -238,17 +266,9 @@ component("ash") {
"rotator/screen_rotation_animator.h",
"rotator/window_rotation.cc",
"rotator/window_rotation.h",
- "scoped_root_window_for_new_windows.cc",
- "scoped_root_window_for_new_windows.h",
"screen_util.cc",
"screen_util.h",
"screenshot_delegate.h",
- "session/session_controller.cc",
- "session/session_controller.h",
- "session/session_state_delegate.cc",
- "session/session_state_delegate.h",
- "session/session_state_observer.cc",
- "session/session_state_observer.h",
"shared/immersive_context.cc",
"shared/immersive_context.h",
"shared/immersive_focus_watcher.h",
@@ -320,10 +340,7 @@ component("ash") {
"shelf/wm_shelf_util.h",
"shell.cc",
"shell.h",
- "shell_delegate.h",
"shell_init_params.h",
- "shutdown_controller.cc",
- "shutdown_controller.h",
"sticky_keys/sticky_keys_controller.cc",
"sticky_keys/sticky_keys_controller.h",
"sticky_keys/sticky_keys_overlay.cc",
@@ -608,14 +625,6 @@ component("ash") {
"utility/screenshot_controller.h",
"virtual_keyboard_controller.cc",
"virtual_keyboard_controller.h",
- "wallpaper/wallpaper_controller.cc",
- "wallpaper/wallpaper_controller.h",
- "wallpaper/wallpaper_controller_observer.h",
- "wallpaper/wallpaper_delegate.h",
- "wallpaper/wallpaper_view.cc",
- "wallpaper/wallpaper_view.h",
- "wallpaper/wallpaper_widget_controller.cc",
- "wallpaper/wallpaper_widget_controller.h",
"wm/always_on_top_controller.cc",
"wm/always_on_top_controller.h",
"wm/ash_focus_rules.cc",
@@ -821,15 +830,6 @@ component("ash") {
"wm/workspace/workspace_window_resizer.h",
"wm/workspace_controller.cc",
"wm/workspace_controller.h",
- "wm_activation_observer.h",
- "wm_display_observer.h",
- "wm_layout_manager.h",
- "wm_shell.cc",
- "wm_shell.h",
- "wm_transient_window_observer.h",
- "wm_window.cc",
- "wm_window.h",
- "wm_window_user_data.h",
]
configs += [ "//build/config:precompiled_headers" ]
@@ -1157,7 +1157,12 @@ source_set("common_unittests") {
"accelerators/spoken_feedback_toggler_unittest.cc",
"ash_touch_exploration_manager_chromeos_unittest.cc",
"autoclick/autoclick_unittest.cc",
- "devtools/ash_devtools_unittest.cc",
+ "common/devtools/ash_devtools_unittest.cc",
+ "common/mus_property_mirror_ash_unittest.cc",
+ "common/session/session_controller_unittest.cc",
+ "common/wallpaper/wallpaper_controller_unittest.cc",
+ "common/wm_window_unittest.cc",
+ "common/wm_window_user_data_unittest.cc",
"drag_drop/drag_image_view_unittest.cc",
"first_run/first_run_helper_unittest.cc",
"focus_cycler_unittest.cc",
@@ -1173,11 +1178,9 @@ source_set("common_unittests") {
"metrics/task_switch_metrics_recorder_unittest.cc",
"metrics/task_switch_time_tracker_unittest.cc",
"metrics/user_metrics_recorder_unittest.cc",
- "mus_property_mirror_ash_unittest.cc",
"root_window_controller_unittest.cc",
"rotator/screen_rotation_animation_unittest.cc",
"screen_util_unittest.cc",
- "session/session_controller_unittest.cc",
"shelf/shelf_application_menu_model_unittest.cc",
"shelf/shelf_background_animator_unittest.cc",
"shelf/shelf_button_pressed_metric_tracker_unittest.cc",
@@ -1229,7 +1232,6 @@ source_set("common_unittests") {
"system/web_notification/web_notification_tray_unittest.cc",
"test/ash_test_helper_unittest.cc",
"tooltips/tooltip_controller_unittest.cc",
- "wallpaper/wallpaper_controller_unittest.cc",
"wm/ash_focus_rules_unittest.cc",
"wm/container_finder_unittest.cc",
"wm/dock/docked_window_layout_manager_unittest.cc",
@@ -1241,8 +1243,6 @@ source_set("common_unittests") {
"wm/mru_window_tracker_unittest.cc",
"wm/overview/cleanup_animation_observer_unittest.cc",
"wm/workspace/workspace_layout_manager_unittest.cc",
- "wm_window_unittest.cc",
- "wm_window_user_data_unittest.cc",
]
deps = [
"//ash",
« no previous file with comments | « WATCHLISTS ('k') | ash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698