diff --git a/ash/BUILD.gn b/ash/BUILD.gn index db8a1dc..e385c47 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn
@@ -15,12 +15,27 @@ component("ash") { sources = [ + "accelerators/accelerator_commands.cc", + "accelerators/accelerator_commands.h", "accelerators/accelerator_commands_aura.cc", "accelerators/accelerator_commands_aura.h", + "accelerators/accelerator_controller.cc", + "accelerators/accelerator_controller.h", + "accelerators/accelerator_controller_delegate.h", "accelerators/accelerator_controller_delegate_aura.cc", "accelerators/accelerator_controller_delegate_aura.h", "accelerators/accelerator_delegate.cc", "accelerators/accelerator_delegate.h", + "accelerators/accelerator_router.cc", + "accelerators/accelerator_router.h", + "accelerators/accelerator_table.cc", + "accelerators/accelerator_table.h", + "accelerators/ash_focus_manager_factory.cc", + "accelerators/ash_focus_manager_factory.h", + "accelerators/debug_commands.cc", + "accelerators/debug_commands.h", + "accelerators/exit_warning_handler.cc", + "accelerators/exit_warning_handler.h", "accelerators/key_hold_detector.cc", "accelerators/key_hold_detector.h", "accelerators/magnifier_key_scroller.cc", @@ -49,21 +64,6 @@ "autoclick/autoclick_controller.h", "cancel_mode.cc", "cancel_mode.h", - "common/accelerators/accelerator_commands.cc", - "common/accelerators/accelerator_commands.h", - "common/accelerators/accelerator_controller.cc", - "common/accelerators/accelerator_controller.h", - "common/accelerators/accelerator_controller_delegate.h", - "common/accelerators/accelerator_router.cc", - "common/accelerators/accelerator_router.h", - "common/accelerators/accelerator_table.cc", - "common/accelerators/accelerator_table.h", - "common/accelerators/ash_focus_manager_factory.cc", - "common/accelerators/ash_focus_manager_factory.h", - "common/accelerators/debug_commands.cc", - "common/accelerators/debug_commands.h", - "common/accelerators/exit_warning_handler.cc", - "common/accelerators/exit_warning_handler.h", "common/accessibility_delegate.h", "common/accessibility_types.h", "common/ash_constants.cc", @@ -80,29 +80,8 @@ "common/devtools/ash_devtools_css_agent.h", "common/devtools/ash_devtools_dom_agent.cc", "common/devtools/ash_devtools_dom_agent.h", - "common/drag_drop/drag_image_view.cc", - "common/drag_drop/drag_image_view.h", "common/focus_cycler.cc", "common/focus_cycler.h", - "common/frame/caption_buttons/caption_button_types.h", - "common/frame/caption_buttons/frame_caption_button.cc", - "common/frame/caption_buttons/frame_caption_button.h", - "common/frame/caption_buttons/frame_caption_button_container_view.cc", - "common/frame/caption_buttons/frame_caption_button_container_view.h", - "common/frame/caption_buttons/frame_size_button.cc", - "common/frame/caption_buttons/frame_size_button.h", - "common/frame/caption_buttons/frame_size_button_delegate.h", - "common/frame/custom_frame_view_ash.cc", - "common/frame/custom_frame_view_ash.h", - "common/frame/default_header_painter.cc", - "common/frame/default_header_painter.h", - "common/frame/frame_border_hit_test.cc", - "common/frame/frame_border_hit_test.h", - "common/frame/header_painter.h", - "common/frame/header_painter_util.cc", - "common/frame/header_painter_util.h", - "common/frame/header_view.cc", - "common/frame/header_view.h", "common/gpu_support.h", "common/gpu_support_stub.cc", "common/gpu_support_stub.h", @@ -116,10 +95,6 @@ "common/material_design/material_design_controller.h", "common/media_controller.cc", "common/media_controller.h", - "common/metrics/gesture_action_type.h", - "common/metrics/pointer_metrics_recorder.cc", - "common/metrics/pointer_metrics_recorder.h", - "common/metrics/user_metrics_action.h", "common/mojo_interface_factory.cc", "common/mojo_interface_factory.h", "common/multi_profile_uma.cc", @@ -135,60 +110,6 @@ "common/session/session_state_delegate.h", "common/session/session_state_observer.cc", "common/session/session_state_observer.h", - "common/shelf/app_list_button.cc", - "common/shelf/app_list_button.h", - "common/shelf/app_list_shelf_item_delegate.cc", - "common/shelf/app_list_shelf_item_delegate.h", - "common/shelf/ink_drop_button_listener.h", - "common/shelf/overflow_bubble.cc", - "common/shelf/overflow_bubble.h", - "common/shelf/overflow_bubble_view.cc", - "common/shelf/overflow_bubble_view.h", - "common/shelf/overflow_button.cc", - "common/shelf/overflow_button.h", - "common/shelf/shelf_alignment_menu.cc", - "common/shelf/shelf_alignment_menu.h", - "common/shelf/shelf_application_menu_model.cc", - "common/shelf/shelf_application_menu_model.h", - "common/shelf/shelf_background_animator.cc", - "common/shelf/shelf_background_animator.h", - "common/shelf/shelf_background_animator_observer.h", - "common/shelf/shelf_button.cc", - "common/shelf/shelf_button.h", - "common/shelf/shelf_button_pressed_metric_tracker.cc", - "common/shelf/shelf_button_pressed_metric_tracker.h", - "common/shelf/shelf_constants.cc", - "common/shelf/shelf_constants.h", - "common/shelf/shelf_controller.cc", - "common/shelf/shelf_controller.h", - "common/shelf/shelf_delegate.h", - "common/shelf/shelf_item_delegate.cc", - "common/shelf/shelf_item_delegate.h", - "common/shelf/shelf_item_types.cc", - "common/shelf/shelf_item_types.h", - "common/shelf/shelf_layout_manager.cc", - "common/shelf/shelf_layout_manager.h", - "common/shelf/shelf_layout_manager_observer.h", - "common/shelf/shelf_locking_manager.cc", - "common/shelf/shelf_locking_manager.h", - "common/shelf/shelf_model.cc", - "common/shelf/shelf_model.h", - "common/shelf/shelf_model_observer.h", - "common/shelf/shelf_tooltip_manager.cc", - "common/shelf/shelf_tooltip_manager.h", - "common/shelf/shelf_view.cc", - "common/shelf/shelf_view.h", - "common/shelf/shelf_widget.cc", - "common/shelf/shelf_widget.h", - "common/shelf/shelf_window_watcher.cc", - "common/shelf/shelf_window_watcher.h", - "common/shelf/shelf_window_watcher_item_delegate.cc", - "common/shelf/shelf_window_watcher_item_delegate.h", - "common/shelf/wm_shelf.cc", - "common/shelf/wm_shelf.h", - "common/shelf/wm_shelf_observer.h", - "common/shelf/wm_shelf_util.cc", - "common/shelf/wm_shelf_util.h", "common/shell_delegate.h", "common/shutdown_controller.cc", "common/shutdown_controller.h", @@ -200,130 +121,6 @@ "common/wallpaper/wallpaper_view.h", "common/wallpaper/wallpaper_widget_controller.cc", "common/wallpaper/wallpaper_widget_controller.h", - "common/wm/always_on_top_controller.cc", - "common/wm/always_on_top_controller.h", - "common/wm/container_finder.cc", - "common/wm/container_finder.h", - "common/wm/default_state.cc", - "common/wm/default_state.h", - "common/wm/default_window_resizer.cc", - "common/wm/default_window_resizer.h", - "common/wm/dock/docked_window_layout_manager.cc", - "common/wm/dock/docked_window_layout_manager.h", - "common/wm/dock/docked_window_layout_manager_observer.h", - "common/wm/dock/docked_window_resizer.cc", - "common/wm/dock/docked_window_resizer.h", - "common/wm/drag_details.cc", - "common/wm/drag_details.h", - "common/wm/focus_rules.cc", - "common/wm/focus_rules.h", - "common/wm/fullscreen_window_finder.cc", - "common/wm/fullscreen_window_finder.h", - "common/wm/immersive_context_ash.cc", - "common/wm/immersive_context_ash.h", - "common/wm/lock_layout_manager.cc", - "common/wm/lock_layout_manager.h", - "common/wm/lock_state_observer.h", - "common/wm/lock_window_state.cc", - "common/wm/lock_window_state.h", - "common/wm/maximize_mode/maximize_mode_controller.cc", - "common/wm/maximize_mode/maximize_mode_controller.h", - "common/wm/maximize_mode/maximize_mode_event_handler.cc", - "common/wm/maximize_mode/maximize_mode_event_handler.h", - "common/wm/maximize_mode/maximize_mode_window_manager.cc", - "common/wm/maximize_mode/maximize_mode_window_manager.h", - "common/wm/maximize_mode/maximize_mode_window_state.cc", - "common/wm/maximize_mode/maximize_mode_window_state.h", - "common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h", - "common/wm/maximize_mode/workspace_backdrop_delegate.cc", - "common/wm/maximize_mode/workspace_backdrop_delegate.h", - "common/wm/mru_window_tracker.cc", - "common/wm/mru_window_tracker.h", - "common/wm/overview/cleanup_animation_observer.cc", - "common/wm/overview/cleanup_animation_observer.h", - "common/wm/overview/overview_animation_type.h", - "common/wm/overview/scoped_overview_animation_settings.h", - "common/wm/overview/scoped_overview_animation_settings_factory.cc", - "common/wm/overview/scoped_overview_animation_settings_factory.h", - "common/wm/overview/scoped_transform_overview_window.cc", - "common/wm/overview/scoped_transform_overview_window.h", - "common/wm/overview/window_grid.cc", - "common/wm/overview/window_grid.h", - "common/wm/overview/window_selector.cc", - "common/wm/overview/window_selector.h", - "common/wm/overview/window_selector_controller.cc", - "common/wm/overview/window_selector_controller.h", - "common/wm/overview/window_selector_item.cc", - "common/wm/overview/window_selector_item.h", - "common/wm/panels/panel_frame_view.cc", - "common/wm/panels/panel_frame_view.h", - "common/wm/panels/panel_layout_manager.cc", - "common/wm/panels/panel_layout_manager.h", - "common/wm/panels/panel_window_resizer.cc", - "common/wm/panels/panel_window_resizer.h", - "common/wm/root_window_finder.cc", - "common/wm/root_window_finder.h", - "common/wm/root_window_layout_manager.cc", - "common/wm/root_window_layout_manager.h", - "common/wm/screen_dimmer.cc", - "common/wm/screen_dimmer.h", - "common/wm/switchable_windows.cc", - "common/wm/switchable_windows.h", - "common/wm/system_modal_container_layout_manager.cc", - "common/wm/system_modal_container_layout_manager.h", - "common/wm/window_animation_types.h", - "common/wm/window_cycle_controller.cc", - "common/wm/window_cycle_controller.h", - "common/wm/window_cycle_event_filter.h", - "common/wm/window_cycle_list.cc", - "common/wm/window_cycle_list.h", - "common/wm/window_dimmer.cc", - "common/wm/window_dimmer.h", - "common/wm/window_parenting_utils.cc", - "common/wm/window_parenting_utils.h", - "common/wm/window_positioner.cc", - "common/wm/window_positioner.h", - "common/wm/window_positioning_utils.cc", - "common/wm/window_positioning_utils.h", - "common/wm/window_resizer.cc", - "common/wm/window_resizer.h", - "common/wm/window_state.cc", - "common/wm/window_state.h", - "common/wm/window_state_delegate.cc", - "common/wm/window_state_delegate.h", - "common/wm/window_state_observer.h", - "common/wm/window_state_util.cc", - "common/wm/window_state_util.h", - "common/wm/wm_event.cc", - "common/wm/wm_event.h", - "common/wm/wm_screen_util.cc", - "common/wm/wm_screen_util.h", - "common/wm/wm_snap_to_pixel_layout_manager.cc", - "common/wm/wm_snap_to_pixel_layout_manager.h", - "common/wm/wm_toplevel_window_event_handler.cc", - "common/wm/wm_toplevel_window_event_handler.h", - "common/wm/wm_types.cc", - "common/wm/wm_types.h", - "common/wm/wm_window_animations.cc", - "common/wm/wm_window_animations.h", - "common/wm/workspace/magnetism_matcher.cc", - "common/wm/workspace/magnetism_matcher.h", - "common/wm/workspace/multi_window_resize_controller.cc", - "common/wm/workspace/multi_window_resize_controller.h", - "common/wm/workspace/phantom_window_controller.cc", - "common/wm/workspace/phantom_window_controller.h", - "common/wm/workspace/two_step_edge_cycler.cc", - "common/wm/workspace/two_step_edge_cycler.h", - "common/wm/workspace/workspace_event_handler.cc", - "common/wm/workspace/workspace_event_handler.h", - "common/wm/workspace/workspace_layout_manager.cc", - "common/wm/workspace/workspace_layout_manager.h", - "common/wm/workspace/workspace_layout_manager_backdrop_delegate.h", - "common/wm/workspace/workspace_types.h", - "common/wm/workspace/workspace_window_resizer.cc", - "common/wm/workspace/workspace_window_resizer.h", - "common/wm/workspace_controller.cc", - "common/wm/workspace_controller.h", "common/wm_activation_observer.h", "common/wm_display_observer.h", "common/wm_layout_manager.h", @@ -388,12 +185,33 @@ "drag_drop/drag_drop_controller.h", "drag_drop/drag_drop_tracker.cc", "drag_drop/drag_drop_tracker.h", + "drag_drop/drag_image_view.cc", + "drag_drop/drag_image_view.h", "first_run/desktop_cleaner.cc", "first_run/desktop_cleaner.h", "first_run/first_run_helper.cc", "first_run/first_run_helper.h", "first_run/first_run_helper_impl.cc", "first_run/first_run_helper_impl.h", + "frame/caption_buttons/caption_button_types.h", + "frame/caption_buttons/frame_caption_button.cc", + "frame/caption_buttons/frame_caption_button.h", + "frame/caption_buttons/frame_caption_button_container_view.cc", + "frame/caption_buttons/frame_caption_button_container_view.h", + "frame/caption_buttons/frame_size_button.cc", + "frame/caption_buttons/frame_size_button.h", + "frame/caption_buttons/frame_size_button_delegate.h", + "frame/custom_frame_view_ash.cc", + "frame/custom_frame_view_ash.h", + "frame/default_header_painter.cc", + "frame/default_header_painter.h", + "frame/frame_border_hit_test.cc", + "frame/frame_border_hit_test.h", + "frame/header_painter.h", + "frame/header_painter_util.cc", + "frame/header_painter_util.h", + "frame/header_view.cc", + "frame/header_view.h", "high_contrast/high_contrast_controller.cc", "high_contrast/high_contrast_controller.h", "host/ash_window_tree_host.cc", @@ -428,10 +246,14 @@ "magnifier/partial_magnification_controller.h", "metrics/desktop_task_switch_metric_recorder.cc", "metrics/desktop_task_switch_metric_recorder.h", + "metrics/gesture_action_type.h", + "metrics/pointer_metrics_recorder.cc", + "metrics/pointer_metrics_recorder.h", "metrics/task_switch_metrics_recorder.cc", "metrics/task_switch_metrics_recorder.h", "metrics/task_switch_time_tracker.cc", "metrics/task_switch_time_tracker.h", + "metrics/user_metrics_action.h", "metrics/user_metrics_recorder.cc", "metrics/user_metrics_recorder.h", "root_window_controller.cc", @@ -458,10 +280,64 @@ "shared/immersive_handler_factory.h", "shared/immersive_revealed_lock.cc", "shared/immersive_revealed_lock.h", + "shelf/app_list_button.cc", + "shelf/app_list_button.h", + "shelf/app_list_shelf_item_delegate.cc", + "shelf/app_list_shelf_item_delegate.h", + "shelf/ink_drop_button_listener.h", + "shelf/overflow_bubble.cc", + "shelf/overflow_bubble.h", + "shelf/overflow_bubble_view.cc", + "shelf/overflow_bubble_view.h", + "shelf/overflow_button.cc", + "shelf/overflow_button.h", + "shelf/shelf_alignment_menu.cc", + "shelf/shelf_alignment_menu.h", + "shelf/shelf_application_menu_model.cc", + "shelf/shelf_application_menu_model.h", + "shelf/shelf_background_animator.cc", + "shelf/shelf_background_animator.h", + "shelf/shelf_background_animator_observer.h", "shelf/shelf_bezel_event_handler.cc", "shelf/shelf_bezel_event_handler.h", + "shelf/shelf_button.cc", + "shelf/shelf_button.h", + "shelf/shelf_button_pressed_metric_tracker.cc", + "shelf/shelf_button_pressed_metric_tracker.h", + "shelf/shelf_constants.cc", + "shelf/shelf_constants.h", + "shelf/shelf_controller.cc", + "shelf/shelf_controller.h", + "shelf/shelf_delegate.h", + "shelf/shelf_item_delegate.cc", + "shelf/shelf_item_delegate.h", + "shelf/shelf_item_types.cc", + "shelf/shelf_item_types.h", + "shelf/shelf_layout_manager.cc", + "shelf/shelf_layout_manager.h", + "shelf/shelf_layout_manager_observer.h", + "shelf/shelf_locking_manager.cc", + "shelf/shelf_locking_manager.h", + "shelf/shelf_model.cc", + "shelf/shelf_model.h", + "shelf/shelf_model_observer.h", + "shelf/shelf_tooltip_manager.cc", + "shelf/shelf_tooltip_manager.h", + "shelf/shelf_view.cc", + "shelf/shelf_view.h", + "shelf/shelf_widget.cc", + "shelf/shelf_widget.h", "shelf/shelf_window_targeter.cc", "shelf/shelf_window_targeter.h", + "shelf/shelf_window_watcher.cc", + "shelf/shelf_window_watcher.h", + "shelf/shelf_window_watcher_item_delegate.cc", + "shelf/shelf_window_watcher_item_delegate.h", + "shelf/wm_shelf.cc", + "shelf/wm_shelf.h", + "shelf/wm_shelf_observer.h", + "shelf/wm_shelf_util.cc", + "shelf/wm_shelf_util.h", "shell.cc", "shell.h", "shell_init_params.h", @@ -749,46 +625,107 @@ "utility/screenshot_controller.h", "virtual_keyboard_controller.cc", "virtual_keyboard_controller.h", + "wm/always_on_top_controller.cc", + "wm/always_on_top_controller.h", "wm/ash_focus_rules.cc", "wm/ash_focus_rules.h", "wm/ash_native_cursor_manager.cc", "wm/ash_native_cursor_manager.h", "wm/boot_splash_screen_chromeos.cc", "wm/boot_splash_screen_chromeos.h", + "wm/container_finder.cc", + "wm/container_finder.h", "wm/cursor_manager_chromeos.cc", "wm/cursor_manager_chromeos.h", + "wm/default_state.cc", + "wm/default_state.h", + "wm/default_window_resizer.cc", + "wm/default_window_resizer.h", + "wm/dock/docked_window_layout_manager.cc", + "wm/dock/docked_window_layout_manager.h", + "wm/dock/docked_window_layout_manager_observer.h", + "wm/dock/docked_window_resizer.cc", + "wm/dock/docked_window_resizer.h", + "wm/drag_details.cc", + "wm/drag_details.h", "wm/drag_window_controller.cc", "wm/drag_window_controller.h", "wm/drag_window_resizer.cc", "wm/drag_window_resizer.h", "wm/event_client_impl.cc", "wm/event_client_impl.h", + "wm/focus_rules.cc", + "wm/focus_rules.h", + "wm/fullscreen_window_finder.cc", + "wm/fullscreen_window_finder.h", "wm/gestures/overview_gesture_handler.cc", "wm/gestures/overview_gesture_handler.h", + "wm/immersive_context_ash.cc", + "wm/immersive_context_ash.h", "wm/immersive_focus_watcher_aura.cc", "wm/immersive_focus_watcher_aura.h", "wm/immersive_gesture_handler_aura.cc", "wm/immersive_gesture_handler_aura.h", "wm/immersive_handler_factory_ash.cc", "wm/immersive_handler_factory_ash.h", + "wm/lock_layout_manager.cc", + "wm/lock_layout_manager.h", "wm/lock_state_controller.cc", "wm/lock_state_controller.h", + "wm/lock_state_observer.h", + "wm/lock_window_state.cc", + "wm/lock_window_state.h", + "wm/maximize_mode/maximize_mode_controller.cc", + "wm/maximize_mode/maximize_mode_controller.h", + "wm/maximize_mode/maximize_mode_event_handler.cc", + "wm/maximize_mode/maximize_mode_event_handler.h", "wm/maximize_mode/maximize_mode_event_handler_aura.cc", "wm/maximize_mode/maximize_mode_event_handler_aura.h", + "wm/maximize_mode/maximize_mode_window_manager.cc", + "wm/maximize_mode/maximize_mode_window_manager.h", + "wm/maximize_mode/maximize_mode_window_state.cc", + "wm/maximize_mode/maximize_mode_window_state.h", + "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h", "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", + "wm/maximize_mode/workspace_backdrop_delegate.cc", + "wm/maximize_mode/workspace_backdrop_delegate.h", + "wm/mru_window_tracker.cc", + "wm/mru_window_tracker.h", "wm/overlay_event_filter.cc", "wm/overlay_event_filter.h", + "wm/overview/cleanup_animation_observer.cc", + "wm/overview/cleanup_animation_observer.h", + "wm/overview/overview_animation_type.h", + "wm/overview/scoped_overview_animation_settings.h", "wm/overview/scoped_overview_animation_settings_aura.cc", "wm/overview/scoped_overview_animation_settings_aura.h", + "wm/overview/scoped_overview_animation_settings_factory.cc", + "wm/overview/scoped_overview_animation_settings_factory.h", "wm/overview/scoped_overview_animation_settings_factory_aura.cc", "wm/overview/scoped_overview_animation_settings_factory_aura.h", + "wm/overview/scoped_transform_overview_window.cc", + "wm/overview/scoped_transform_overview_window.h", + "wm/overview/window_grid.cc", + "wm/overview/window_grid.h", + "wm/overview/window_selector.cc", + "wm/overview/window_selector.h", + "wm/overview/window_selector_controller.cc", + "wm/overview/window_selector_controller.h", + "wm/overview/window_selector_item.cc", + "wm/overview/window_selector_item.h", "wm/panels/attached_panel_window_targeter.cc", "wm/panels/attached_panel_window_targeter.h", + "wm/panels/panel_frame_view.cc", + "wm/panels/panel_frame_view.h", + "wm/panels/panel_layout_manager.cc", + "wm/panels/panel_layout_manager.h", "wm/panels/panel_window_event_handler.cc", "wm/panels/panel_window_event_handler.h", + "wm/panels/panel_window_resizer.cc", + "wm/panels/panel_window_resizer.h", "wm/power_button_controller.cc", "wm/power_button_controller.h", "wm/resize_handle_window_targeter.cc", @@ -797,6 +734,12 @@ "wm/resize_shadow.h", "wm/resize_shadow_controller.cc", "wm/resize_shadow_controller.h", + "wm/root_window_finder.cc", + "wm/root_window_finder.h", + "wm/root_window_layout_manager.cc", + "wm/root_window_layout_manager.h", + "wm/screen_dimmer.cc", + "wm/screen_dimmer.h", "wm/screen_pinning_controller.cc", "wm/screen_pinning_controller.h", "wm/session_state_animator.cc", @@ -805,31 +748,88 @@ "wm/session_state_animator_impl.h", "wm/stacking_controller.cc", "wm/stacking_controller.h", + "wm/switchable_windows.cc", + "wm/switchable_windows.h", "wm/system_gesture_event_filter.cc", "wm/system_gesture_event_filter.h", "wm/system_modal_container_event_filter.cc", "wm/system_modal_container_event_filter.h", "wm/system_modal_container_event_filter_delegate.h", + "wm/system_modal_container_layout_manager.cc", + "wm/system_modal_container_layout_manager.h", "wm/system_wallpaper_controller.cc", "wm/system_wallpaper_controller.h", "wm/toplevel_window_event_handler.cc", "wm/toplevel_window_event_handler.h", "wm/video_detector.cc", "wm/video_detector.h", + "wm/window_animation_types.h", "wm/window_animations.cc", "wm/window_animations.h", + "wm/window_cycle_controller.cc", + "wm/window_cycle_controller.h", + "wm/window_cycle_event_filter.h", "wm/window_cycle_event_filter_aura.cc", "wm/window_cycle_event_filter_aura.h", + "wm/window_cycle_list.cc", + "wm/window_cycle_list.h", + "wm/window_dimmer.cc", + "wm/window_dimmer.h", "wm/window_mirror_view.cc", "wm/window_mirror_view.h", + "wm/window_parenting_utils.cc", + "wm/window_parenting_utils.h", + "wm/window_positioner.cc", + "wm/window_positioner.h", + "wm/window_positioning_utils.cc", + "wm/window_positioning_utils.h", "wm/window_properties.cc", "wm/window_properties.h", + "wm/window_resizer.cc", + "wm/window_resizer.h", + "wm/window_state.cc", + "wm/window_state.h", "wm/window_state_aura.cc", "wm/window_state_aura.h", + "wm/window_state_delegate.cc", + "wm/window_state_delegate.h", + "wm/window_state_observer.h", + "wm/window_state_util.cc", + "wm/window_state_util.h", "wm/window_util.cc", "wm/window_util.h", + "wm/wm_event.cc", + "wm/wm_event.h", + "wm/wm_screen_util.cc", + "wm/wm_screen_util.h", + "wm/wm_snap_to_pixel_layout_manager.cc", + "wm/wm_snap_to_pixel_layout_manager.h", + "wm/wm_toplevel_window_event_handler.cc", + "wm/wm_toplevel_window_event_handler.h", + "wm/wm_types.cc", + "wm/wm_types.h", + "wm/wm_window_animations.cc", + "wm/wm_window_animations.h", + "wm/workspace/magnetism_matcher.cc", + "wm/workspace/magnetism_matcher.h", + "wm/workspace/multi_window_resize_controller.cc", + "wm/workspace/multi_window_resize_controller.h", + "wm/workspace/phantom_window_controller.cc", + "wm/workspace/phantom_window_controller.h", + "wm/workspace/two_step_edge_cycler.cc", + "wm/workspace/two_step_edge_cycler.h", + "wm/workspace/workspace_event_handler.cc", + "wm/workspace/workspace_event_handler.h", "wm/workspace/workspace_event_handler_aura.cc", "wm/workspace/workspace_event_handler_aura.h", + "wm/workspace/workspace_layout_manager.cc", + "wm/workspace/workspace_layout_manager.h", + "wm/workspace/workspace_layout_manager_backdrop_delegate.h", + "wm/workspace/workspace_types.h", + "wm/workspace/workspace_window_resizer.cc", + "wm/workspace/workspace_window_resizer.h", + "wm/workspace_controller.cc", + "wm/workspace_controller.h", ] configs += [ "//build/config:precompiled_headers" ] @@ -1153,49 +1153,45 @@ sources = [ "accelerators/accelerator_controller_unittest.cc", "accelerators/accelerator_filter_unittest.cc", + "accelerators/accelerator_table_unittest.cc", "accelerators/spoken_feedback_toggler_unittest.cc", "ash_touch_exploration_manager_chromeos_unittest.cc", "autoclick/autoclick_unittest.cc", - "common/accelerators/accelerator_table_unittest.cc", "common/devtools/ash_devtools_unittest.cc", - "common/drag_drop/drag_image_view_unittest.cc", - "common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc", - "common/frame/custom_frame_view_ash_unittest.cc", - "common/frame/default_header_painter_unittest.cc", - "common/metrics/pointer_metrics_recorder_unittest.cc", "common/mus_property_mirror_ash_unittest.cc", "common/session/session_controller_unittest.cc", - "common/shelf/shelf_application_menu_model_unittest.cc", - "common/shelf/shelf_background_animator_unittest.cc", - "common/shelf/shelf_button_pressed_metric_tracker_unittest.cc", - "common/shelf/shelf_locking_manager_unittest.cc", - "common/shelf/shelf_model_unittest.cc", - "common/shelf/shelf_tooltip_manager_unittest.cc", - "common/shelf/shelf_window_watcher_unittest.cc", "common/wallpaper/wallpaper_controller_unittest.cc", - "common/wm/container_finder_unittest.cc", - "common/wm/mru_window_tracker_unittest.cc", - "common/wm/overview/cleanup_animation_observer_unittest.cc", - "common/wm/workspace/workspace_layout_manager_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", + "frame/caption_buttons/frame_caption_button_container_view_unittest.cc", "frame/caption_buttons/frame_size_button_unittest.cc", + "frame/custom_frame_view_ash_unittest.cc", + "frame/default_header_painter_unittest.cc", "laser/laser_pointer_controller_unittest.cc", "laser/laser_pointer_points_unittest.cc", "laser/laser_segment_utils_unittest.cc", "metrics/desktop_task_switch_metric_recorder_unittest.cc", + "metrics/pointer_metrics_recorder_unittest.cc", "metrics/task_switch_metrics_recorder_unittest.cc", "metrics/task_switch_time_tracker_unittest.cc", "metrics/user_metrics_recorder_unittest.cc", "root_window_controller_unittest.cc", "rotator/screen_rotation_animation_unittest.cc", "screen_util_unittest.cc", + "shelf/shelf_application_menu_model_unittest.cc", + "shelf/shelf_background_animator_unittest.cc", + "shelf/shelf_button_pressed_metric_tracker_unittest.cc", "shelf/shelf_layout_manager_unittest.cc", + "shelf/shelf_locking_manager_unittest.cc", + "shelf/shelf_model_unittest.cc", + "shelf/shelf_tooltip_manager_unittest.cc", "shelf/shelf_unittest.cc", "shelf/shelf_view_unittest.cc", "shelf/shelf_widget_unittest.cc", + "shelf/shelf_window_watcher_unittest.cc", "shell_unittest.cc", "sticky_keys/sticky_keys_overlay_unittest.cc", "sticky_keys/sticky_keys_unittest.cc", @@ -1237,12 +1233,16 @@ "test/ash_test_helper_unittest.cc", "tooltips/tooltip_controller_unittest.cc", "wm/ash_focus_rules_unittest.cc", + "wm/container_finder_unittest.cc", "wm/dock/docked_window_layout_manager_unittest.cc", "wm/dock/docked_window_resizer_unittest.cc", "wm/immersive_fullscreen_controller_unittest.cc", "wm/lock_state_controller_unittest.cc", "wm/maximize_mode/accelerometer_test_data_literals.cc", "wm/maximize_mode/maximize_mode_window_manager_unittest.cc", + "wm/mru_window_tracker_unittest.cc", + "wm/overview/cleanup_animation_observer_unittest.cc", + "wm/workspace/workspace_layout_manager_unittest.cc", ] deps = [ "//ash",
diff --git a/ash/common/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc similarity index 89% rename from ash/common/accelerators/accelerator_commands.cc rename to ash/accelerators/accelerator_commands.cc index 3fe7d171..7c34110 100644 --- a/ash/common/accelerators/accelerator_commands.cc +++ b/ash/accelerators/accelerator_commands.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_commands.h" +#include "ash/accelerators/accelerator_commands.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" #include "base/metrics/user_metrics.h" namespace ash {
diff --git a/ash/common/accelerators/accelerator_commands.h b/ash/accelerators/accelerator_commands.h similarity index 84% rename from ash/common/accelerators/accelerator_commands.h rename to ash/accelerators/accelerator_commands.h index 279c59e1..df576ba 100644 --- a/ash/common/accelerators/accelerator_commands.h +++ b/ash/accelerators/accelerator_commands.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_ -#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_ +#ifndef ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_ +#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_ #include "ash/ash_export.h" @@ -28,4 +28,4 @@ } // namespace accelerators } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_ +#endif // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc index 88ad889..e78f996 100644 --- a/ash/accelerators/accelerator_commands_aura.cc +++ b/ash/accelerators/accelerator_commands_aura.cc
@@ -4,10 +4,10 @@ #include "ash/accelerators/accelerator_commands_aura.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/wm/screen_pinning_controller.h" +#include "ash/wm/window_state.h" #include "base/metrics/user_metrics.h" #include "ui/display/manager/display_manager.h" #include "ui/display/manager/managed_display_info.h"
diff --git a/ash/accelerators/accelerator_commands_unittest.cc b/ash/accelerators/accelerator_commands_unittest.cc index 04661ab..8c56ef3 100644 --- a/ash/accelerators/accelerator_commands_unittest.cc +++ b/ash/accelerators/accelerator_commands_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_commands.h" +#include "ash/accelerators/accelerator_commands.h" #include <memory> #include "ash/accelerators/accelerator_commands_aura.h" -#include "ash/common/wm/window_state.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h"
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc similarity index 98% rename from ash/common/accelerators/accelerator_controller.cc rename to ash/accelerators/accelerator_controller.cc index 0fdc14d..21eda7d2 100644 --- a/ash/common/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include <utility> -#include "ash/common/accelerators/accelerator_commands.h" -#include "ash/common/accelerators/accelerator_controller_delegate.h" -#include "ash/common/accelerators/debug_commands.h" +#include "ash/accelerators/accelerator_commands.h" +#include "ash/accelerators/accelerator_controller_delegate.h" +#include "ash/accelerators/debug_commands.h" #include "ash/common/accessibility_delegate.h" #include "ash/common/accessibility_types.h" #include "ash/common/focus_cycler.h" @@ -18,19 +18,13 @@ #include "ash/common/new_window_controller.h" #include "ash/common/palette_delegate.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/window_cycle_controller.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/brightness_control_delegate.h" #include "ash/system/ime_menu/ime_menu_tray.h" @@ -42,6 +36,12 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/web_notification/web_notification_tray.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/window_cycle_controller.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/ash/common/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h similarity index 96% rename from ash/common/accelerators/accelerator_controller.h rename to ash/accelerators/accelerator_controller.h index 0a39c63..4be34b7f5 100644 --- a/ash/common/accelerators/accelerator_controller.h +++ b/ash/accelerators/accelerator_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ -#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ +#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ +#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ #include <stddef.h> @@ -12,9 +12,9 @@ #include <set> #include <vector> +#include "ash/accelerators/accelerator_table.h" +#include "ash/accelerators/exit_warning_handler.h" #include "ash/ash_export.h" -#include "ash/common/accelerators/accelerator_table.h" -#include "ash/common/accelerators/exit_warning_handler.h" #include "ash/public/interfaces/accelerator_controller.mojom.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" @@ -231,4 +231,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ +#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
diff --git a/ash/common/accelerators/accelerator_controller_delegate.h b/ash/accelerators/accelerator_controller_delegate.h similarity index 84% rename from ash/common/accelerators/accelerator_controller_delegate.h rename to ash/accelerators/accelerator_controller_delegate.h index 291d9fd5..81c06e4 100644 --- a/ash/common/accelerators/accelerator_controller_delegate.h +++ b/ash/accelerators/accelerator_controller_delegate.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_ -#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_ +#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_ +#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_ +#include "ash/accelerators/accelerator_table.h" #include "ash/ash_export.h" -#include "ash/common/accelerators/accelerator_table.h" namespace ui { class Accelerator; @@ -47,4 +47,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_ +#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc index d72cb56..9fddcad 100644 --- a/ash/accelerators/accelerator_controller_delegate_aura.cc +++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -10,14 +10,10 @@ #include <utility> #include "ash/accelerators/accelerator_commands_aura.h" -#include "ash/common/accelerators/debug_commands.h" +#include "ash/accelerators/debug_commands.h" #include "ash/common/accessibility_types.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/debug.h" #include "ash/display/display_configuration_controller.h" @@ -28,14 +24,18 @@ #include "ash/root_window_controller.h" #include "ash/rotator/window_rotation.h" #include "ash/screenshot_delegate.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray.h" #include "ash/touch/touch_hud_debug.h" #include "ash/utility/screenshot_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/power_button_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.h b/ash/accelerators/accelerator_controller_delegate_aura.h index 3f68382..2338dd9 100644 --- a/ash/accelerators/accelerator_controller_delegate_aura.h +++ b/ash/accelerators/accelerator_controller_delegate_aura.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/accelerators/accelerator_controller_delegate.h" +#include "ash/accelerators/accelerator_controller_delegate.h" #include "base/macros.h" namespace ash {
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index a654aa2f..c8b88b7c 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -2,19 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_table.h" #include "ash/common/accessibility_delegate.h" #include "ash/common/accessibility_types.h" #include "ash/common/ash_switches.h" #include "ash/common/ime_control_delegate.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" @@ -26,9 +21,14 @@ #include "ash/test/lock_state_controller_test_api.h" #include "ash/test/test_screenshot_delegate.h" #include "ash/test/test_session_state_animator.h" +#include "ash/test/test_shelf_delegate.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/command_line.h" #include "base/test/user_action_tester.cc" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/accelerators/accelerator_delegate.cc b/ash/accelerators/accelerator_delegate.cc index 679813f..3a87b0e 100644 --- a/ash/accelerators/accelerator_delegate.cc +++ b/ash/accelerators/accelerator_delegate.cc
@@ -4,7 +4,7 @@ #include "ash/accelerators/accelerator_delegate.h" -#include "ash/common/accelerators/accelerator_router.h" +#include "ash/accelerators/accelerator_router.h" #include "ash/common/wm_window.h" #include "ui/aura/window.h" #include "ui/events/event.h"
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc index f19204b8..2b1b55d 100644 --- a/ash/accelerators/accelerator_filter_unittest.cc +++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -6,16 +6,16 @@ #include <memory> +#include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_delegate.h" -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "ash/test/test_screenshot_delegate.h" +#include "ash/test/test_session_state_delegate.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc index 323ef08..30332fc 100644 --- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc +++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/network/network_observer.h" @@ -13,6 +12,7 @@ #include "ash/system/tray/system_tray_notifier.h" #include "ash/test/ash_interactive_ui_test_base.h" #include "ash/test/test_screenshot_delegate.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/run_loop.h"
diff --git a/ash/common/accelerators/accelerator_router.cc b/ash/accelerators/accelerator_router.cc similarity index 96% rename from ash/common/accelerators/accelerator_router.cc rename to ash/accelerators/accelerator_router.cc index 2a42383..36fc6d8 100644 --- a/ash/common/accelerators/accelerator_router.cc +++ b/ash/accelerators/accelerator_router.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_router.h" +#include "ash/accelerators/accelerator_router.h" -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/wm/window_state.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_state.h" #include "base/metrics/histogram_macros.h" #include "base/stl_util.h" #include "ui/base/accelerators/accelerator.h"
diff --git a/ash/common/accelerators/accelerator_router.h b/ash/accelerators/accelerator_router.h similarity index 100% rename from ash/common/accelerators/accelerator_router.h rename to ash/accelerators/accelerator_router.h
diff --git a/ash/common/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc similarity index 99% rename from ash/common/accelerators/accelerator_table.cc rename to ash/accelerators/accelerator_table.cc index f0f06f82..bda1e1d 100644 --- a/ash/common/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_table.h" #include "ash/strings/grit/ash_strings.h" #include "base/macros.h"
diff --git a/ash/common/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h similarity index 97% rename from ash/common/accelerators/accelerator_table.h rename to ash/accelerators/accelerator_table.h index 86a4e0d1..34b8476 100644 --- a/ash/common/accelerators/accelerator_table.h +++ b/ash/accelerators/accelerator_table.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_ -#define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_ +#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ +#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ #include <stddef.h> @@ -261,4 +261,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_ +#endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
diff --git a/ash/common/accelerators/accelerator_table_unittest.cc b/ash/accelerators/accelerator_table_unittest.cc similarity index 98% rename from ash/common/accelerators/accelerator_table_unittest.cc rename to ash/accelerators/accelerator_table_unittest.cc index e469625..927165f 100644 --- a/ash/common/accelerators/accelerator_table_unittest.cc +++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -4,7 +4,7 @@ #include <set> -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_table.h" #include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/common/accelerators/ash_focus_manager_factory.cc b/ash/accelerators/ash_focus_manager_factory.cc similarity index 88% rename from ash/common/accelerators/ash_focus_manager_factory.cc rename to ash/accelerators/ash_focus_manager_factory.cc index 058e0575..596a8d2 100644 --- a/ash/common/accelerators/ash_focus_manager_factory.cc +++ b/ash/accelerators/ash_focus_manager_factory.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/ash_focus_manager_factory.h" +#include "ash/accelerators/ash_focus_manager_factory.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_shell.h" #include "base/memory/ptr_util.h" #include "ui/views/focus/focus_manager.h"
diff --git a/ash/common/accelerators/ash_focus_manager_factory.h b/ash/accelerators/ash_focus_manager_factory.h similarity index 84% rename from ash/common/accelerators/ash_focus_manager_factory.h rename to ash/accelerators/ash_focus_manager_factory.h index 32d9e9a..5d4ac24 100644 --- a/ash/common/accelerators/ash_focus_manager_factory.h +++ b/ash/accelerators/ash_focus_manager_factory.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_ -#define ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_ +#ifndef ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_ +#define ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_ #include "base/macros.h" #include "ui/views/focus/focus_manager_delegate.h" @@ -35,4 +35,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_ +#endif // ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
diff --git a/ash/common/accelerators/debug_commands.cc b/ash/accelerators/debug_commands.cc similarity index 97% rename from ash/common/accelerators/debug_commands.cc rename to ash/accelerators/debug_commands.cc index e54ec89..94e978c0 100644 --- a/ash/common/accelerators/debug_commands.cc +++ b/ash/accelerators/debug_commands.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/debug_commands.h" +#include "ash/accelerators/debug_commands.h" -#include "ash/common/accelerators/accelerator_commands.h" +#include "ash/accelerators/accelerator_commands.h" #include "ash/common/ash_switches.h" #include "ash/common/shell_delegate.h" #include "ash/common/wallpaper/wallpaper_controller.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/system/toast/toast_data.h" #include "ash/system/toast/toast_manager.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_properties.h" #include "base/command_line.h" #include "base/metrics/user_metrics.h"
diff --git a/ash/common/accelerators/debug_commands.h b/ash/accelerators/debug_commands.h similarity index 82% rename from ash/common/accelerators/debug_commands.h rename to ash/accelerators/debug_commands.h index 3ef73ae4..e6a0bab 100644 --- a/ash/common/accelerators/debug_commands.h +++ b/ash/accelerators/debug_commands.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_ -#define ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_ +#ifndef ASH_ACCELERATORS_DEBUG_COMMANDS_H_ +#define ASH_ACCELERATORS_DEBUG_COMMANDS_H_ +#include "ash/accelerators/accelerator_table.h" #include "ash/ash_export.h" -#include "ash/common/accelerators/accelerator_table.h" // This file contains implementations of commands that are used only when // debugging. @@ -33,4 +33,4 @@ } // namespace debug } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_ +#endif // ASH_ACCELERATORS_DEBUG_COMMANDS_H_
diff --git a/ash/common/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc similarity index 98% rename from ash/common/accelerators/exit_warning_handler.cc rename to ash/accelerators/exit_warning_handler.cc index 9f6b970..b575066 100644 --- a/ash/common/accelerators/exit_warning_handler.cc +++ b/ash/accelerators/exit_warning_handler.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/exit_warning_handler.h" +#include "ash/accelerators/exit_warning_handler.h" #include "ash/common/shell_delegate.h" #include "ash/common/wm_shell.h"
diff --git a/ash/common/accelerators/exit_warning_handler.h b/ash/accelerators/exit_warning_handler.h similarity index 91% rename from ash/common/accelerators/exit_warning_handler.h rename to ash/accelerators/exit_warning_handler.h index d992ba9..c678f84d 100644 --- a/ash/common/accelerators/exit_warning_handler.h +++ b/ash/accelerators/exit_warning_handler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_ -#define ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_ +#ifndef ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_ +#define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_ #include <memory> @@ -81,4 +81,4 @@ } // namespace ash -#endif // ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_ +#endif // ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
diff --git a/ash/app_list/app_list_delegate_impl.cc b/ash/app_list/app_list_delegate_impl.cc index 8f5c63b..79b2d89b 100644 --- a/ash/app_list/app_list_delegate_impl.cc +++ b/ash/app_list/app_list_delegate_impl.cc
@@ -4,11 +4,11 @@ #include "ash/app_list/app_list_delegate_impl.h" -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ui/app_list/presenter/app_list.h" namespace ash {
diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc index fd56856..d252ebf0 100644 --- a/ash/app_list/app_list_presenter_delegate.cc +++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -5,12 +5,6 @@ #include "ash/app_list/app_list_presenter_delegate.h" #include "ash/common/ash_switches.h" -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" @@ -18,7 +12,13 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/wm_screen_util.h" #include "base/command_line.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_switches.h"
diff --git a/ash/app_list/app_list_presenter_delegate.h b/ash/app_list/app_list_presenter_delegate.h index 964061b..7fd185f 100644 --- a/ash/app_list/app_list_presenter_delegate.h +++ b/ash/app_list/app_list_presenter_delegate.h
@@ -8,8 +8,8 @@ #include <stdint.h> #include "ash/ash_export.h" -#include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/shell_observer.h" +#include "ash/shelf/wm_shelf_observer.h" #include "base/macros.h" #include "ui/app_list/presenter/app_list_presenter_delegate.h" #include "ui/events/event_handler.h"
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc index 8398546..4f6861852 100644 --- a/ash/aura/wm_shell_aura.cc +++ b/ash/aura/wm_shell_aura.cc
@@ -11,9 +11,6 @@ #include "ash/common/session/session_state_delegate.h" #include "ash/common/shell_delegate.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_activation_observer.h" #include "ash/common/wm_display_observer.h" #include "ash/common/wm_window.h" @@ -28,6 +25,9 @@ #include "ash/virtual_keyboard_controller.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_selector_controller.h" #include "ash/wm/screen_pinning_controller.h" #include "ash/wm/window_cycle_event_filter_aura.h" #include "ash/wm/window_util.h"
diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc index 85bf13e..cbe9c0c9b 100644 --- a/ash/autoclick/autoclick_controller.cc +++ b/ash/autoclick/autoclick_controller.cc
@@ -6,10 +6,10 @@ #include "ash/autoclick/common/autoclick_controller_common.h" #include "ash/autoclick/common/autoclick_controller_common_delegate.h" -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/root_window_finder.h" #include "base/timer/timer.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tree_host.h"
diff --git a/ash/common/devtools/ash_devtools_unittest.cc b/ash/common/devtools/ash_devtools_unittest.cc index 7c96bff..9aa0192 100644 --- a/ash/common/devtools/ash_devtools_unittest.cc +++ b/ash/common/devtools/ash_devtools_unittest.cc
@@ -4,10 +4,10 @@ #include "ash/common/devtools/ash_devtools_css_agent.h" #include "ash/common/devtools/ash_devtools_dom_agent.h" -#include "ash/common/test/ash_test.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/test/ash_test.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "ui/display/display.h"
diff --git a/ash/common/drag_drop/OWNERS b/ash/common/drag_drop/OWNERS deleted file mode 100644 index d231d19d..0000000 --- a/ash/common/drag_drop/OWNERS +++ /dev/null
@@ -1 +0,0 @@ -mfomitchev@chromium.org
diff --git a/ash/common/focus_cycler.cc b/ash/common/focus_cycler.cc index 5ef50d4..47ef19b 100644 --- a/ash/common/focus_cycler.cc +++ b/ash/common/focus_cycler.cc
@@ -4,10 +4,10 @@ #include "ash/common/focus_cycler.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/focus/focus_search.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/frame/OWNERS b/ash/common/frame/OWNERS deleted file mode 100644 index e710530..0000000 --- a/ash/common/frame/OWNERS +++ /dev/null
@@ -1 +0,0 @@ -pkotwicz@chromium.org
diff --git a/ash/common/metrics/OWNERS b/ash/common/metrics/OWNERS deleted file mode 100644 index 21cb7090..0000000 --- a/ash/common/metrics/OWNERS +++ /dev/null
@@ -1 +0,0 @@ -tdanderson@chromium.org
diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc index f8a6b0fb..74a87496 100644 --- a/ash/common/mojo_interface_factory.cc +++ b/ash/common/mojo_interface_factory.cc
@@ -6,20 +6,20 @@ #include <utility> -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/cast_config_controller.h" #include "ash/common/media_controller.h" #include "ash/common/new_window_controller.h" #include "ash/common/session/session_controller.h" -#include "ash/common/shelf/shelf_controller.h" #include "ash/common/shell_delegate.h" #include "ash/common/shutdown_controller.h" #include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_controller.h" #include "ash/system/locale/locale_notification_controller.h" #include "ash/system/network/vpn_list.h" #include "ash/system/tray/system_tray_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/bind.h" #include "services/service_manager/public/cpp/interface_registry.h" #include "ui/app_list/presenter/app_list.h"
diff --git a/ash/common/mus_property_mirror_ash_unittest.cc b/ash/common/mus_property_mirror_ash_unittest.cc index e81f05b0..a869e86 100644 --- a/ash/common/mus_property_mirror_ash_unittest.cc +++ b/ash/common/mus_property_mirror_ash_unittest.cc
@@ -6,9 +6,9 @@ #include <string> -#include "ash/common/test/ash_test.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" +#include "ash/test/ash_test.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/common/wallpaper/wallpaper_view.cc b/ash/common/wallpaper/wallpaper_view.cc index 2aed6b6..f3ad6ae3 100644 --- a/ash/common/wallpaper/wallpaper_view.cc +++ b/ash/common/wallpaper/wallpaper_view.cc
@@ -8,10 +8,10 @@ #include "ash/common/wallpaper/wallpaper_controller.h" #include "ash/common/wallpaper/wallpaper_delegate.h" #include "ash/common/wallpaper/wallpaper_widget_controller.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/wm/overview/window_selector_controller.h" #include "ui/display/display.h" #include "ui/display/manager/managed_display_info.h" #include "ui/display/screen.h"
diff --git a/ash/common/wm/OWNERS b/ash/common/wm/OWNERS deleted file mode 100644 index 6310ae0..0000000 --- a/ash/common/wm/OWNERS +++ /dev/null
@@ -1,3 +0,0 @@ -pkotwicz@chromium.org -varkha@chromium.org -flackr@chromium.org
diff --git a/ash/common/wm/maximize_mode/OWNERS b/ash/common/wm/maximize_mode/OWNERS deleted file mode 100644 index 0debac9..0000000 --- a/ash/common/wm/maximize_mode/OWNERS +++ /dev/null
@@ -1,2 +0,0 @@ -skuhne@chromium.org -
diff --git a/ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h b/ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h deleted file mode 100644 index cfad8ee..0000000 --- a/ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h +++ /dev/null
@@ -1,17 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_ -#define ASH_COMMON_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_ - -namespace ash { - -class ScopedDisableInternalMouseAndKeyboard { - public: - virtual ~ScopedDisableInternalMouseAndKeyboard() {} -}; - -} // namespace ash - -#endif // ASH_COMMON_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
diff --git a/ash/common/wm/panels/OWNERS b/ash/common/wm/panels/OWNERS deleted file mode 100644 index aa215c7..0000000 --- a/ash/common/wm/panels/OWNERS +++ /dev/null
@@ -1 +0,0 @@ -stevenjb@chromium.org
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc index d89bd7b..6bbbe0b3 100644 --- a/ash/common/wm_shell.cc +++ b/ash/common/wm_shell.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/accelerators/ash_focus_manager_factory.h" +#include "ash/accelerators/accelerator_controller.h" +#include "ash/accelerators/ash_focus_manager_factory.h" #include "ash/common/accessibility_delegate.h" #include "ash/common/cast_config_controller.h" #include "ash/common/devtools/ash_devtools_css_agent.h" @@ -19,26 +19,19 @@ #include "ash/common/palette_delegate.h" #include "ash/common/session/session_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/app_list_shelf_item_delegate.h" -#include "ash/common/shelf/shelf_controller.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_window_watcher.h" #include "ash/common/shell_delegate.h" #include "ash/common/shutdown_controller.h" #include "ash/common/wallpaper/wallpaper_controller.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/immersive_context_ash.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/root_window_finder.h" -#include "ash/common/wm/system_modal_container_layout_manager.h" -#include "ash/common/wm/window_cycle_controller.h" #include "ash/common/wm_activation_observer.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/app_list_shelf_item_delegate.h" +#include "ash/shelf/shelf_controller.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_window_watcher.h" #include "ash/shell.h" #include "ash/system/brightness/brightness_controller_chromeos.h" #include "ash/system/brightness_control_delegate.h" @@ -51,6 +44,13 @@ #include "ash/system/tray/system_tray_controller.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm/immersive_context_ash.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/root_window_finder.h" +#include "ash/wm/system_modal_container_layout_manager.h" +#include "ash/wm/window_cycle_controller.h" #include "base/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h index 528a61c..eacc525b 100644 --- a/ash/common/wm_shell.h +++ b/ash/common/wm_shell.h
@@ -11,10 +11,10 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/metrics/gesture_action_type.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/session/session_state_observer.h" -#include "ash/common/wm/lock_state_observer.h" +#include "ash/metrics/gesture_action_type.h" +#include "ash/metrics/user_metrics_action.h" +#include "ash/wm/lock_state_observer.h" #include "base/observer_list.h" #include "components/ui_devtools/devtools_server.h" #include "ui/base/ui_base_types.h"
diff --git a/ash/common/wm_window.cc b/ash/common/wm_window.cc index cb4018c..38697a1 100644 --- a/ash/common/wm_window.cc +++ b/ash/common/wm_window.cc
@@ -7,19 +7,19 @@ #include "ash/aura/aura_layout_manager_adapter.h" #include "ash/aura/wm_shell_aura.h" #include "ash/common/ash_constants.h" -#include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_layout_manager.h" #include "ash/common/wm_transient_window_observer.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_item_types.h" #include "ash/shell.h" #include "ash/wm/resize_handle_window_targeter.h" #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_mirror_view.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/memory/ptr_util.h"
diff --git a/ash/common/wm_window_unittest.cc b/ash/common/wm_window_unittest.cc index 2cbe553..9b69c0b 100644 --- a/ash/common/wm_window_unittest.cc +++ b/ash/common/wm_window_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "ash/common/test/ash_test.h" +#include "ash/test/ash_test.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h"
diff --git a/ash/common/wm_window_user_data_unittest.cc b/ash/common/wm_window_user_data_unittest.cc index 3c65711..a8e9695 100644 --- a/ash/common/wm_window_user_data_unittest.cc +++ b/ash/common/wm_window_user_data_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "ash/common/test/ash_test.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/common/wm_window_user_data.h" +#include "ash/test/ash_test.h" #include "base/memory/ptr_util.h" namespace ash {
diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc index 4911957..e89c7b3 100644 --- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc +++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -8,8 +8,6 @@ #include <vector> #include "ash/common/ash_switches.h" -#include "ash/common/test/test_system_tray_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/content/shell_content_state.h" #include "ash/shell.h" @@ -19,6 +17,8 @@ #include "ash/test/ash_test_helper.h" #include "ash/test/content/test_shell_content_state.h" #include "ash/test/test_shell_delegate.h" +#include "ash/test/test_system_tray_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" #include "chromeos/accelerometer/accelerometer_reader.h" #include "chromeos/accelerometer/accelerometer_types.h"
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc index 1943640..a600a8da 100644 --- a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc +++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
@@ -4,8 +4,8 @@ #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc index 5cd23568..c4e4173 100644 --- a/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc +++ b/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_table.h" #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h" #include "ash/content/shell_content_state.h" #include "ash/test/ash_test_base.h"
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index 0e1abed3..80c3301 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc
@@ -5,8 +5,8 @@ #include <algorithm> #include <vector> -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_properties.h"
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 7f3e87e..b8b856c 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc
@@ -6,7 +6,6 @@ #include "ash/accelerators/accelerator_commands_aura.h" #include "ash/common/ash_switches.h" -#include "ash/common/wm/window_state.h" #include "ash/display/display_configuration_controller.h" #include "ash/display/display_util.h" #include "ash/display/mirror_window_controller.h" @@ -16,6 +15,7 @@ #include "ash/strings/grit/ash_strings.h" #include "ash/test/ash_test_base.h" #include "ash/test/mirror_window_test_api.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "base/format_macros.h"
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc index fdcc28b..077186b 100644 --- a/ash/display/root_window_transformers_unittest.cc +++ b/ash/display/root_window_transformers_unittest.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "ash/common/shelf/shelf_widget.h" #include "ash/display/display_util.h" #include "ash/host/root_window_transformer.h" #include "ash/magnifier/magnification_controller.h" #include "ash/screen_util.h" +#include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h"
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc index c6a2847..b743dc7 100644 --- a/ash/display/screen_ash.cc +++ b/ash/display/screen_ash.cc
@@ -4,13 +4,13 @@ #include "ash/display/screen_ash.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" +#include "ash/shelf/shelf_widget.h" #include "ash/shell.h" +#include "ash/wm/root_window_finder.h" #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc index 1048900..1a0ce91 100644 --- a/ash/display/screen_orientation_controller_chromeos.cc +++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -5,11 +5,11 @@ #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/common/ash_switches.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/display_configuration_controller.h" #include "ash/shell.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "chromeos/accelerometer/accelerometer_reader.h"
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index 6481c0f..a11c24a 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc
@@ -4,13 +4,13 @@ #include "ash/display/screen_position_controller.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/dip_util.h"
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc index 2f1a3bc..5aab608 100644 --- a/ash/display/window_tree_host_manager_unittest.cc +++ b/ash/display/window_tree_host_manager_unittest.cc
@@ -6,20 +6,20 @@ #include <memory> -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_window.h" #include "ash/display/display_util.h" #include "ash/screen_util.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "base/command_line.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h"
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 1d07181..3c16d1fb0 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "ash/common/drag_drop/drag_image_view.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/drag_drop/drag_drop_tracker.h" +#include "ash/drag_drop/drag_image_view.h" #include "ash/shell.h" #include "base/bind.h" #include "base/message_loop/message_loop.h"
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 5218187..d026fd5 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -4,8 +4,8 @@ #include "ash/drag_drop/drag_drop_controller.h" -#include "ash/common/drag_drop/drag_image_view.h" #include "ash/drag_drop/drag_drop_tracker.h" +#include "ash/drag_drop/drag_image_view.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/command_line.h"
diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 48b877f3..e64897b 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc
@@ -4,10 +4,10 @@ #include "ash/drag_drop/drag_drop_tracker.h" -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/root_window_finder.h" #include "ui/aura/client/window_parenting_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/common/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc similarity index 98% rename from ash/common/drag_drop/drag_image_view.cc rename to ash/drag_drop/drag_image_view.cc index 1306bf1..4cb2beb 100644 --- a/ash/common/drag_drop/drag_image_view.cc +++ b/ash/drag_drop/drag_image_view.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/drag_drop/drag_image_view.h" +#include "ash/drag_drop/drag_image_view.h" #include <memory>
diff --git a/ash/common/drag_drop/drag_image_view.h b/ash/drag_drop/drag_image_view.h similarity index 95% rename from ash/common/drag_drop/drag_image_view.h rename to ash/drag_drop/drag_image_view.h index de6e4d5..be1830e 100644 --- a/ash/common/drag_drop/drag_image_view.h +++ b/ash/drag_drop/drag_image_view.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_ -#define ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_ +#ifndef ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_ +#define ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_ #include <memory> @@ -100,4 +100,4 @@ } // namespace ash -#endif // ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_ +#endif // ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
diff --git a/ash/common/drag_drop/drag_image_view_unittest.cc b/ash/drag_drop/drag_image_view_unittest.cc similarity index 96% rename from ash/common/drag_drop/drag_image_view_unittest.cc rename to ash/drag_drop/drag_image_view_unittest.cc index e74d1bc..6fa0bd3 100644 --- a/ash/common/drag_drop/drag_image_view_unittest.cc +++ b/ash/drag_drop/drag_image_view_unittest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/drag_drop/drag_image_view.h" +#include "ash/drag_drop/drag_image_view.h" -#include "ash/common/test/ash_test.h" +#include "ash/test/ash_test.h" #include "ui/base/dragdrop/drag_drop_types.h" namespace ash {
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 93eb88f..62c1b9f 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/root_window_finder.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" #include "base/strings/string_util.h"
diff --git a/ash/first_run/first_run_helper_impl.cc b/ash/first_run/first_run_helper_impl.cc index db8f411..af9c7fef 100644 --- a/ash/first_run/first_run_helper_impl.cc +++ b/ash/first_run/first_run_helper_impl.cc
@@ -4,12 +4,12 @@ #include "ash/first_run/first_run_helper_impl.h" -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "base/logging.h"
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 03b81df..5166b718 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/status_area_widget.h" #include "ash/system/status_area_widget_delegate.h" #include "ash/system/tray/system_tray.h"
diff --git a/ash/common/frame/caption_buttons/caption_button_types.h b/ash/frame/caption_buttons/caption_button_types.h similarity index 75% rename from ash/common/frame/caption_buttons/caption_button_types.h rename to ash/frame/caption_buttons/caption_button_types.h index ca067be..ece7d8e9c 100644 --- a/ash/common/frame/caption_buttons/caption_button_types.h +++ b/ash/frame/caption_buttons/caption_button_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_ -#define ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_ +#ifndef ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_ +#define ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_ namespace ash { @@ -22,4 +22,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_ +#endif // ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
diff --git a/ash/common/frame/caption_buttons/frame_caption_button.cc b/ash/frame/caption_buttons/frame_caption_button.cc similarity index 98% rename from ash/common/frame/caption_buttons/frame_caption_button.cc rename to ash/frame/caption_buttons/frame_caption_button.cc index 0d26e0d..9879443 100644 --- a/ash/common/frame/caption_buttons/frame_caption_button.cc +++ b/ash/frame/caption_buttons/frame_caption_button.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/caption_buttons/frame_caption_button.h" +#include "ash/frame/caption_buttons/frame_caption_button.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/animation/throb_animation.h"
diff --git a/ash/common/frame/caption_buttons/frame_caption_button.h b/ash/frame/caption_buttons/frame_caption_button.h similarity index 91% rename from ash/common/frame/caption_buttons/frame_caption_button.h rename to ash/frame/caption_buttons/frame_caption_button.h index 8b6df285..0d296a8 100644 --- a/ash/common/frame/caption_buttons/frame_caption_button.h +++ b/ash/frame/caption_buttons/frame_caption_button.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ -#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ +#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ +#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/frame/caption_buttons/caption_button_types.h" +#include "ash/frame/caption_buttons/caption_button_types.h" #include "base/macros.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/controls/button/custom_button.h" @@ -103,4 +103,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ +#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
diff --git a/ash/common/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc similarity index 97% rename from ash/common/frame/caption_buttons/frame_caption_button_container_view.cc rename to ash/frame/caption_buttons/frame_caption_button_container_view.cc index 3539a04..63a97dd 100644 --- a/ash/common/frame/caption_buttons/frame_caption_button_container_view.cc +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include <cmath> #include <map> -#include "ash/common/frame/caption_buttons/frame_caption_button.h" -#include "ash/common/frame/caption_buttons/frame_size_button.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" +#include "ash/frame/caption_buttons/frame_caption_button.h" +#include "ash/frame/caption_buttons/frame_size_button.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h"
diff --git a/ash/common/frame/caption_buttons/frame_caption_button_container_view.h b/ash/frame/caption_buttons/frame_caption_button_container_view.h similarity index 94% rename from ash/common/frame/caption_buttons/frame_caption_button_container_view.h rename to ash/frame/caption_buttons/frame_caption_button_container_view.h index 014071a..4c59001 100644 --- a/ash/common/frame/caption_buttons/frame_caption_button_container_view.h +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ -#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ +#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ +#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ #include <map> #include "ash/ash_export.h" -#include "ash/common/frame/caption_buttons/frame_size_button_delegate.h" +#include "ash/frame/caption_buttons/frame_size_button_delegate.h" #include "base/macros.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/views/controls/button/button.h" @@ -155,4 +155,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ +#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
diff --git a/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc similarity index 97% rename from ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc rename to ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc index f84fe43f..f2be7fee 100644 --- a/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc +++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" +#include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/common/frame/caption_buttons/frame_size_button.cc b/ash/frame/caption_buttons/frame_size_button.cc similarity index 97% rename from ash/common/frame/caption_buttons/frame_size_button.cc rename to ash/frame/caption_buttons/frame_size_button.cc index cc2fe20..7fa8612a 100644 --- a/ash/common/frame/caption_buttons/frame_size_button.cc +++ b/ash/frame/caption_buttons/frame_size_button.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/caption_buttons/frame_size_button.h" +#include "ash/frame/caption_buttons/frame_size_button.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace/phantom_window_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace/phantom_window_controller.h" #include "base/i18n/rtl.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/frame/caption_buttons/frame_size_button.h b/ash/frame/caption_buttons/frame_size_button.h similarity index 92% rename from ash/common/frame/caption_buttons/frame_size_button.h rename to ash/frame/caption_buttons/frame_size_button.h index 0ab4dcf..bebca5a 100644 --- a/ash/common/frame/caption_buttons/frame_size_button.h +++ b/ash/frame/caption_buttons/frame_size_button.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ -#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ +#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ +#define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/frame/caption_buttons/frame_caption_button.h" -#include "ash/common/frame/caption_buttons/frame_size_button_delegate.h" +#include "ash/frame/caption_buttons/frame_caption_button.h" +#include "ash/frame/caption_buttons/frame_size_button_delegate.h" #include "base/macros.h" #include "base/timer/timer.h" @@ -117,4 +117,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_ +#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
diff --git a/ash/common/frame/caption_buttons/frame_size_button_delegate.h b/ash/frame/caption_buttons/frame_size_button_delegate.h similarity index 84% rename from ash/common/frame/caption_buttons/frame_size_button_delegate.h rename to ash/frame/caption_buttons/frame_size_button_delegate.h index 026436ac..87ee688 100644 --- a/ash/common/frame/caption_buttons/frame_size_button_delegate.h +++ b/ash/frame/caption_buttons/frame_size_button_delegate.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_ -#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_ +#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_ +#define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_ #include "ash/ash_export.h" -#include "ash/common/frame/caption_buttons/caption_button_types.h" +#include "ash/frame/caption_buttons/caption_button_types.h" namespace gfx { class Point; @@ -50,4 +50,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_ +#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc index e7bfe7b4..9742dbf 100644 --- a/ash/frame/caption_buttons/frame_size_button_unittest.cc +++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/caption_buttons/frame_size_button.h" +#include "ash/frame/caption_buttons/frame_size_button.h" #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/wm/window_state.h" +#include "ash/frame/caption_buttons/frame_caption_button.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/i18n/rtl.h" #include "ui/aura/window.h"
diff --git a/ash/common/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc similarity index 96% rename from ash/common/frame/custom_frame_view_ash.cc rename to ash/frame/custom_frame_view_ash.cc index 470dd01..a41420ff 100644 --- a/ash/common/frame/custom_frame_view_ash.cc +++ b/ash/frame/custom_frame_view_ash.cc
@@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/custom_frame_view_ash.h" +#include "ash/frame/custom_frame_view_ash.h" #include <algorithm> #include <vector> -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/frame_border_hit_test.h" -#include "ash/common/frame/header_view.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_delegate.h" -#include "ash/common/wm/window_state_observer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/frame_border_hit_test.h" +#include "ash/frame/header_view.h" #include "ash/shared/immersive_fullscreen_controller.h" #include "ash/shared/immersive_fullscreen_controller_delegate.h" +#include "ash/wm/window_state.h" +#include "ash/wm/window_state_delegate.h" +#include "ash/wm/window_state_observer.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h"
diff --git a/ash/common/frame/custom_frame_view_ash.h b/ash/frame/custom_frame_view_ash.h similarity index 96% rename from ash/common/frame/custom_frame_view_ash.h rename to ash/frame/custom_frame_view_ash.h index b2e50be..c012c05 100644 --- a/ash/common/frame/custom_frame_view_ash.h +++ b/ash/frame/custom_frame_view_ash.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ -#define ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ +#ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ +#define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ #include <memory> @@ -111,4 +111,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ +#endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
diff --git a/ash/common/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc similarity index 95% rename from ash/common/frame/custom_frame_view_ash_unittest.cc rename to ash/frame/custom_frame_view_ash_unittest.cc index b5729ef3..27c7e272 100644 --- a/ash/common/frame/custom_frame_view_ash_unittest.cc +++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/custom_frame_view_ash.h" +#include "ash/frame/custom_frame_view_ash.h" #include <memory> #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" +#include "ash/frame/caption_buttons/frame_caption_button.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_session_state_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_unittest_util.h"
diff --git a/ash/common/frame/default_header_painter.cc b/ash/frame/default_header_painter.cc similarity index 98% rename from ash/common/frame/default_header_painter.cc rename to ash/frame/default_header_painter.cc index 519cfe2..de78dbb8 100644 --- a/ash/common/frame/default_header_painter.cc +++ b/ash/frame/default_header_painter.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/default_header_painter.h" +#include "ash/frame/default_header_painter.h" #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/header_painter_util.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/header_painter_util.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "base/debug/leak_annotations.h"
diff --git a/ash/common/frame/default_header_painter.h b/ash/frame/default_header_painter.h similarity index 94% rename from ash/common/frame/default_header_painter.h rename to ash/frame/default_header_painter.h index c499929..c6f715f 100644 --- a/ash/common/frame/default_header_painter.h +++ b/ash/frame/default_header_painter.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_ -#define ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_ +#ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ +#define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/frame/header_painter.h" +#include "ash/frame/header_painter.h" #include "base/compiler_specific.h" // override #include "base/gtest_prod_util.h" #include "base/macros.h" @@ -118,4 +118,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_ +#endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
diff --git a/ash/common/frame/default_header_painter_unittest.cc b/ash/frame/default_header_painter_unittest.cc similarity index 95% rename from ash/common/frame/default_header_painter_unittest.cc rename to ash/frame/default_header_painter_unittest.cc index 85d5ddd..083a8c0 100644 --- a/ash/common/frame/default_header_painter_unittest.cc +++ b/ash/frame/default_header_painter_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/default_header_painter.h" +#include "ash/frame/default_header_painter.h" #include <memory> -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ui/views/test/test_views.h"
diff --git a/ash/common/frame/frame_border_hit_test.cc b/ash/frame/frame_border_hit_test.cc similarity index 94% rename from ash/common/frame/frame_border_hit_test.cc rename to ash/frame/frame_border_hit_test.cc index 3f0116a1..58cb7ff1 100644 --- a/ash/common/frame/frame_border_hit_test.cc +++ b/ash/frame/frame_border_hit_test.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/frame_border_hit_test.h" +#include "ash/frame/frame_border_hit_test.h" #include "ash/common/ash_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/common/wm_shell.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/ash/common/frame/frame_border_hit_test.h b/ash/frame/frame_border_hit_test.h similarity index 79% rename from ash/common/frame/frame_border_hit_test.h rename to ash/frame/frame_border_hit_test.h index 4c79cad..083ba6a9 100644 --- a/ash/common/frame/frame_border_hit_test.h +++ b/ash/frame/frame_border_hit_test.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_ -#define ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_ +#ifndef ASH_FRAME_FRAME_BORDER_HIT_TEST_H_ +#define ASH_FRAME_FRAME_BORDER_HIT_TEST_H_ #include "ash/ash_export.h" @@ -27,4 +27,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_ +#endif // ASH_FRAME_FRAME_BORDER_HIT_TEST_H_
diff --git a/ash/common/frame/header_painter.h b/ash/frame/header_painter.h similarity index 89% rename from ash/common/frame/header_painter.h rename to ash/frame/header_painter.h index f60d62f..517f2aa 100644 --- a/ash/common/frame/header_painter.h +++ b/ash/frame/header_painter.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_HEADER_PAINTER_H_ -#define ASH_COMMON_FRAME_HEADER_PAINTER_H_ +#ifndef ASH_FRAME_HEADER_PAINTER_H_ +#define ASH_FRAME_HEADER_PAINTER_H_ #include "ash/ash_export.h" @@ -44,4 +44,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_HEADER_PAINTER_H_ +#endif // ASH_FRAME_HEADER_PAINTER_H_
diff --git a/ash/common/frame/header_painter_util.cc b/ash/frame/header_painter_util.cc similarity index 98% rename from ash/common/frame/header_painter_util.cc rename to ash/frame/header_painter_util.cc index 6d5a11f2..4d8b4a7 100644 --- a/ash/common/frame/header_painter_util.cc +++ b/ash/frame/header_painter_util.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/header_painter_util.h" +#include "ash/frame/header_painter_util.h" #include <algorithm>
diff --git a/ash/common/frame/header_painter_util.h b/ash/frame/header_painter_util.h similarity index 91% rename from ash/common/frame/header_painter_util.h rename to ash/frame/header_painter_util.h index 71c42ad..d0b5e3c 100644 --- a/ash/common/frame/header_painter_util.h +++ b/ash/frame/header_painter_util.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_ -#define ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_ +#ifndef ASH_FRAME_HEADER_PAINTER_UTIL_H_ +#define ASH_FRAME_HEADER_PAINTER_UTIL_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -52,4 +52,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_ +#endif // ASH_FRAME_HEADER_PAINTER_UTIL_H_
diff --git a/ash/common/frame/header_view.cc b/ash/frame/header_view.cc similarity index 96% rename from ash/common/frame/header_view.cc rename to ash/frame/header_view.cc index fbd326a..206489c 100644 --- a/ash/common/frame/header_view.cc +++ b/ash/frame/header_view.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/frame/header_view.h" +#include "ash/frame/header_view.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/default_header_painter.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/default_header_painter.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/frame/header_view.h b/ash/frame/header_view.h similarity index 96% rename from ash/common/frame/header_view.h rename to ash/frame/header_view.h index d96a62a3..78c9774 100644 --- a/ash/common/frame/header_view.h +++ b/ash/frame/header_view.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_FRAME_HEADER_VIEW_H_ -#define ASH_COMMON_FRAME_HEADER_VIEW_H_ +#ifndef ASH_FRAME_HEADER_VIEW_H_ +#define ASH_FRAME_HEADER_VIEW_H_ #include <memory> @@ -113,4 +113,4 @@ } // namespace ash -#endif // ASH_COMMON_FRAME_HEADER_VIEW_H_ +#endif // ASH_FRAME_HEADER_VIEW_H_
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 8e4bdbe7..ab2a4e3 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/accessibility_delegate.h" #include "ash/common/wm_shell.h" #include "ash/display/root_window_transformers.h"
diff --git a/ash/common/metrics/gesture_action_type.h b/ash/metrics/gesture_action_type.h similarity index 86% rename from ash/common/metrics/gesture_action_type.h rename to ash/metrics/gesture_action_type.h index feee85a..120298dc1 100644 --- a/ash/common/metrics/gesture_action_type.h +++ b/ash/metrics/gesture_action_type.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_ -#define ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_ +#ifndef ASH_METRICS_GESTURE_ACTION_TYPE_H_ +#define ASH_METRICS_GESTURE_ACTION_TYPE_H_ namespace ash { @@ -37,4 +37,4 @@ } // namespace ash -#endif // ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_ +#endif // ASH_METRICS_GESTURE_ACTION_TYPE_H_
diff --git a/ash/common/metrics/pointer_metrics_recorder.cc b/ash/metrics/pointer_metrics_recorder.cc similarity index 95% rename from ash/common/metrics/pointer_metrics_recorder.cc rename to ash/metrics/pointer_metrics_recorder.cc index be9e91cb3..da85806 100644 --- a/ash/common/metrics/pointer_metrics_recorder.cc +++ b/ash/metrics/pointer_metrics_recorder.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/metrics/pointer_metrics_recorder.h" +#include "ash/metrics/pointer_metrics_recorder.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/shared/app_types.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/metrics/histogram_macros.h" #include "ui/events/event_constants.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/metrics/pointer_metrics_recorder.h b/ash/metrics/pointer_metrics_recorder.h similarity index 82% rename from ash/common/metrics/pointer_metrics_recorder.h rename to ash/metrics/pointer_metrics_recorder.h index bf19e909..e3d49f6 100644 --- a/ash/common/metrics/pointer_metrics_recorder.h +++ b/ash/metrics/pointer_metrics_recorder.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_ -#define UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_ +#ifndef UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_ +#define UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -36,4 +36,4 @@ } // namespace ash -#endif // UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_ +#endif // UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_
diff --git a/ash/common/metrics/pointer_metrics_recorder_unittest.cc b/ash/metrics/pointer_metrics_recorder_unittest.cc similarity index 98% rename from ash/common/metrics/pointer_metrics_recorder_unittest.cc rename to ash/metrics/pointer_metrics_recorder_unittest.cc index ed212cd..be1ae6d 100644 --- a/ash/common/metrics/pointer_metrics_recorder_unittest.cc +++ b/ash/metrics/pointer_metrics_recorder_unittest.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/metrics/pointer_metrics_recorder.h" +#include "ash/metrics/pointer_metrics_recorder.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shared/app_types.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/test/histogram_tester.h" #include "ui/events/event.h" #include "ui/views/pointer_watcher.h"
diff --git a/ash/metrics/task_switch_metrics_recorder.h b/ash/metrics/task_switch_metrics_recorder.h index 164d0ce5..c637d4a 100644 --- a/ash/metrics/task_switch_metrics_recorder.h +++ b/ash/metrics/task_switch_metrics_recorder.h
@@ -10,7 +10,7 @@ #include <unordered_map> #include "ash/ash_export.h" -#include "ash/common/metrics/task_switch_source.h" +#include "ash/metrics/task_switch_source.h" #include "base/macros.h" namespace ash {
diff --git a/ash/common/metrics/task_switch_source.h b/ash/metrics/task_switch_source.h similarity index 86% rename from ash/common/metrics/task_switch_source.h rename to ash/metrics/task_switch_source.h index 6b1bf0e..d915281 100644 --- a/ash/common/metrics/task_switch_source.h +++ b/ash/metrics/task_switch_source.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_ -#define ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_ +#ifndef ASH_METRICS_TASK_SWITCH_SOURCE_H_ +#define ASH_METRICS_TASK_SWITCH_SOURCE_H_ namespace ash { @@ -27,4 +27,4 @@ } // namespace ash -#endif // ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_ +#endif // ASH_METRICS_TASK_SWITCH_SOURCE_H_
diff --git a/ash/common/metrics/user_metrics_action.h b/ash/metrics/user_metrics_action.h similarity index 96% rename from ash/common/metrics/user_metrics_action.h rename to ash/metrics/user_metrics_action.h index 0c6917a0..e76b613 100644 --- a/ash/common/metrics/user_metrics_action.h +++ b/ash/metrics/user_metrics_action.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_METRICS_USER_METRICS_ACTION_H_ -#define ASH_COMMON_METRICS_USER_METRICS_ACTION_H_ +#ifndef ASH_METRICS_USER_METRICS_ACTION_H_ +#define ASH_METRICS_USER_METRICS_ACTION_H_ namespace ash { @@ -147,4 +147,4 @@ } // namespace ash -#endif // ASH_COMMON_METRICS_USER_METRICS_ACTION_H_ +#endif // ASH_METRICS_USER_METRICS_ACTION_H_
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc index 85c8914..639eb1e 100644 --- a/ash/metrics/user_metrics_recorder.cc +++ b/ash/metrics/user_metrics_recorder.cc
@@ -4,20 +4,20 @@ #include "ash/metrics/user_metrics_recorder.h" -#include "ash/common/metrics/pointer_metrics_recorder.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/metrics/desktop_task_switch_metric_recorder.h" +#include "ash/metrics/pointer_metrics_recorder.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/metrics/user_metrics_recorder.h b/ash/metrics/user_metrics_recorder.h index 7437dff..524c5c1 100644 --- a/ash/metrics/user_metrics_recorder.h +++ b/ash/metrics/user_metrics_recorder.h
@@ -8,8 +8,8 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/metrics/task_switch_metrics_recorder.h" +#include "ash/metrics/user_metrics_action.h" #include "base/macros.h" #include "base/timer/timer.h"
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc index 8351032..ed228427 100644 --- a/ash/metrics/user_metrics_recorder_unittest.cc +++ b/ash/metrics/user_metrics_recorder_unittest.cc
@@ -7,12 +7,12 @@ #include <memory> #include "ash/common/login_status.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_model.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/test/test_system_tray_delegate.h" #include "ash/test/user_metrics_recorder_test_api.h" #include "base/test/histogram_tester.h" #include "ui/aura/window.h"
diff --git a/ash/mus/accelerators/accelerator_controller_delegate_mus.h b/ash/mus/accelerators/accelerator_controller_delegate_mus.h index 79a30fee..fce5bfd 100644 --- a/ash/mus/accelerators/accelerator_controller_delegate_mus.h +++ b/ash/mus/accelerators/accelerator_controller_delegate_mus.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ #define ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_ -#include "ash/common/accelerators/accelerator_controller_delegate.h" +#include "ash/accelerators/accelerator_controller_delegate.h" #include "base/macros.h" namespace ash {
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc index ef1f124..4bf2c403 100644 --- a/ash/mus/accelerators/accelerator_controller_registrar.cc +++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -6,8 +6,8 @@ #include <limits> -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/accelerators/accelerator_router.h" +#include "ash/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_router.h" #include "ash/common/wm_shell.h" #include "ash/mus/accelerators/accelerator_ids.h" #include "ash/mus/window_manager.h"
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc index a60bd2e..2470cfc4c 100644 --- a/ash/mus/bridge/wm_shell_mus.cc +++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -6,17 +6,12 @@ #include <utility> -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/key_event_watcher.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/shell_delegate.h" #include "ash/common/shell_observer.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" -#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_cycle_event_filter.h" -#include "ash/common/wm/window_resizer.h" #include "ash/common/wm_window.h" #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" #include "ash/mus/accelerators/accelerator_controller_registrar.h" @@ -32,6 +27,11 @@ #include "ash/shell.h" #include "ash/shell_init_params.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_event_handler.h" +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_cycle_event_filter.h" +#include "ash/wm/window_resizer.h" #include "ash/wm/window_util.h" #include "base/memory/ptr_util.h" #include "components/user_manager/user_info_impl.h"
diff --git a/ash/mus/bridge/workspace_event_handler_mus.h b/ash/mus/bridge/workspace_event_handler_mus.h index 6f10ad7..00a300e 100644 --- a/ash/mus/bridge/workspace_event_handler_mus.h +++ b/ash/mus/bridge/workspace_event_handler_mus.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_ #define ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_ -#include "ash/common/wm/workspace/workspace_event_handler.h" +#include "ash/wm/workspace/workspace_event_handler.h" #include "base/macros.h" namespace aura {
diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc index c3fe04f..e53ae563 100644 --- a/ash/mus/context_menu_mus.cc +++ b/ash/mus/context_menu_mus.cc
@@ -4,11 +4,11 @@ #include "ash/mus/context_menu_mus.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wallpaper/wallpaper_controller.h" #include "ash/common/wallpaper/wallpaper_delegate.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" namespace ash {
diff --git a/ash/mus/context_menu_mus.h b/ash/mus/context_menu_mus.h index 01f69f5..c3d27fb 100644 --- a/ash/mus/context_menu_mus.h +++ b/ash/mus/context_menu_mus.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_CONTEXT_MENU_MUS_H_ #define ASH_MUS_CONTEXT_MENU_MUS_H_ -#include "ash/common/shelf/shelf_alignment_menu.h" +#include "ash/shelf/shelf_alignment_menu.h" #include "base/macros.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/ash/mus/drag_window_resizer.h b/ash/mus/drag_window_resizer.h index 4d57087..cd46660 100644 --- a/ash/mus/drag_window_resizer.h +++ b/ash/mus/drag_window_resizer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/window_resizer.h" #include "base/macros.h" namespace ash {
diff --git a/ash/mus/frame/custom_frame_view_mus.h b/ash/mus/frame/custom_frame_view_mus.h index 413e45e..3129455 100644 --- a/ash/mus/frame/custom_frame_view_mus.h +++ b/ash/mus/frame/custom_frame_view_mus.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_FRAME_CUSTOM_FRAME_VIEW_MUS_H_ #define ASH_MUS_FRAME_CUSTOM_FRAME_VIEW_MUS_H_ -#include "ash/common/frame/custom_frame_view_ash.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ui/compositor/paint_cache.h" namespace ash {
diff --git a/ash/mus/frame/detached_title_area_renderer.cc b/ash/mus/frame/detached_title_area_renderer.cc index c6f42235..181b3f6d 100644 --- a/ash/mus/frame/detached_title_area_renderer.cc +++ b/ash/mus/frame/detached_title_area_renderer.cc
@@ -4,11 +4,11 @@ #include "ash/mus/frame/detached_title_area_renderer.h" -#include "ash/common/frame/header_view.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" +#include "ash/frame/header_view.h" #include "ash/mus/property_util.h" #include "ash/mus/window_manager.h" +#include "ash/wm/window_state.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/transient_window_client.h" #include "ui/aura/mus/property_converter.h"
diff --git a/ash/mus/move_event_handler.h b/ash/mus/move_event_handler.h index 754882b..8854c45 100644 --- a/ash/mus/move_event_handler.h +++ b/ash/mus/move_event_handler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/wm/wm_toplevel_window_event_handler.h" +#include "ash/wm/wm_toplevel_window_event_handler.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h"
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc index 12b1639f..06442090 100644 --- a/ash/mus/non_client_frame_controller.cc +++ b/ash/mus/non_client_frame_controller.cc
@@ -12,9 +12,8 @@ #include "ash/common/ash_constants.h" #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/custom_frame_view_ash.h" -#include "ash/common/wm/panels/panel_frame_view.h" #include "ash/common/wm_window.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ash/mus/frame/custom_frame_view_mus.h" #include "ash/mus/frame/detached_title_area_renderer.h" #include "ash/mus/move_event_handler.h" @@ -22,6 +21,7 @@ #include "ash/mus/window_manager.h" #include "ash/mus/window_properties.h" #include "ash/shared/immersive_fullscreen_controller_delegate.h" +#include "ash/wm/panels/panel_frame_view.h" #include "ash/wm/window_properties.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ash/mus/screen_mus.cc b/ash/mus/screen_mus.cc index e58cff9..4785d7d 100644 --- a/ash/mus/screen_mus.cc +++ b/ash/mus/screen_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/screen_mus.h" -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" +#include "ash/wm/root_window_finder.h" #include "services/ui/public/interfaces/display/display_controller.mojom.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc index 3f0e6d8..4b8ba01 100644 --- a/ash/mus/shelf_delegate_mus.cc +++ b/ash/mus/shelf_delegate_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/shelf_delegate_mus.h" -#include "ash/common/shelf/shelf_controller.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_controller.h" #include "base/strings/string_util.h" namespace ash {
diff --git a/ash/mus/shelf_delegate_mus.h b/ash/mus/shelf_delegate_mus.h index 8f45b8da..9ca5799 100644 --- a/ash/mus/shelf_delegate_mus.h +++ b/ash/mus/shelf_delegate_mus.h
@@ -7,8 +7,8 @@ #include <string> -#include "ash/common/shelf/shelf_delegate.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_delegate.h" namespace ash {
diff --git a/ash/mus/test/ash_test_impl_mus.cc b/ash/mus/test/ash_test_impl_mus.cc index 71a44f4..2aa95e1 100644 --- a/ash/mus/test/ash_test_impl_mus.cc +++ b/ash/mus/test/ash_test_impl_mus.cc
@@ -4,8 +4,8 @@ #include "ash/mus/test/ash_test_impl_mus.h" -#include "ash/common/test/ash_test.h" #include "ash/common/wm_window.h" +#include "ash/test/ash_test.h" #include "base/memory/ptr_util.h" #include "services/ui/public/cpp/property_type_converters.h" #include "services/ui/public/interfaces/window_manager.mojom.h"
diff --git a/ash/mus/test/ash_test_impl_mus.h b/ash/mus/test/ash_test_impl_mus.h index e0ba272f..5e900aa 100644 --- a/ash/mus/test/ash_test_impl_mus.h +++ b/ash/mus/test/ash_test_impl_mus.h
@@ -5,8 +5,8 @@ #ifndef ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ -#include "ash/common/test/ash_test_impl.h" #include "ash/mus/test/wm_test_base.h" +#include "ash/test/ash_test_impl.h" #include "base/macros.h" namespace ash {
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc index d3839cfe..d079535 100644 --- a/ash/mus/test/wm_test_helper.cc +++ b/ash/mus/test/wm_test_helper.cc
@@ -4,13 +4,13 @@ #include "ash/mus/test/wm_test_helper.h" -#include "ash/common/test/wm_shell_test_api.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/mus/screen_mus.h" #include "ash/mus/window_manager.h" #include "ash/mus/window_manager_application.h" #include "ash/test/test_shell_delegate.h" +#include "ash/test/wm_shell_test_api.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/ash/mus/top_level_window_factory.cc b/ash/mus/top_level_window_factory.cc index 602d0c3..cdcc9e2 100644 --- a/ash/mus/top_level_window_factory.cc +++ b/ash/mus/top_level_window_factory.cc
@@ -4,8 +4,6 @@ #include "ash/mus/top_level_window_factory.h" -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/mus/disconnected_app_handler.h" @@ -16,6 +14,8 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" +#include "ash/wm/container_finder.h" +#include "ash/wm/window_state.h" #include "mojo/public/cpp/bindings/type_converter.h" #include "services/ui/public/cpp/property_type_converters.h" #include "services/ui/public/interfaces/window_manager.mojom.h"
diff --git a/ash/mus/top_level_window_factory_unittest.cc b/ash/mus/top_level_window_factory_unittest.cc index 2fb98002..c4b03e1a 100644 --- a/ash/mus/top_level_window_factory_unittest.cc +++ b/ash/mus/top_level_window_factory_unittest.cc
@@ -10,12 +10,12 @@ #include <string> #include <vector> -#include "ash/common/test/ash_test.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/mus/test/wm_test_base.h" #include "ash/mus/window_manager.h" #include "ash/mus/window_manager_application.h" +#include "ash/test/ash_test.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "ui/aura/window.h"
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc index 8818e3c..61338662 100644 --- a/ash/mus/window_manager.cc +++ b/ash/mus/window_manager.cc
@@ -9,8 +9,6 @@ #include <utility> #include "ash/common/session/session_controller.h" -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/mus/accelerators/accelerator_handler.h" #include "ash/mus/accelerators/accelerator_ids.h" @@ -30,6 +28,8 @@ #include "ash/shell.h" #include "ash/shell_init_params.h" #include "ash/wm/ash_focus_rules.h" +#include "ash/wm/container_finder.h" +#include "ash/wm/window_state.h" #include "base/memory/ptr_util.h" #include "base/threading/sequenced_worker_pool.h" #include "services/service_manager/public/cpp/connector.h"
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 5708746..a4ffb45 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc
@@ -15,26 +15,9 @@ #include "ash/common/focus_cycler.h" #include "ash/common/login_status.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_delegate.h" #include "ash/common/wallpaper/wallpaper_delegate.h" #include "ash/common/wallpaper/wallpaper_widget_controller.h" -#include "ash/common/wm/always_on_top_controller.h" -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/common/wm/lock_layout_manager.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/root_window_layout_manager.h" -#include "ash/common/wm/switchable_windows.h" -#include "ash/common/wm/system_modal_container_layout_manager.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_screen_util.h" -#include "ash/common/wm/workspace/workspace_layout_manager.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/high_contrast/high_contrast_controller.h" @@ -42,7 +25,11 @@ #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_settings.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" #include "ash/shelf/shelf_window_targeter.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/status_area_layout_manager.h" #include "ash/system/status_area_widget.h" @@ -50,14 +37,27 @@ #include "ash/touch/touch_hud_debug.h" #include "ash/touch/touch_hud_projection.h" #include "ash/touch/touch_observer_hud.h" +#include "ash/wm/always_on_top_controller.h" #include "ash/wm/boot_splash_screen_chromeos.h" +#include "ash/wm/container_finder.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/fullscreen_window_finder.h" +#include "ash/wm/lock_layout_manager.h" #include "ash/wm/panels/attached_panel_window_targeter.h" +#include "ash/wm/panels/panel_layout_manager.h" #include "ash/wm/panels/panel_window_event_handler.h" +#include "ash/wm/root_window_layout_manager.h" #include "ash/wm/stacking_controller.h" +#include "ash/wm/switchable_windows.h" +#include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/system_wallpaper_controller.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_screen_util.h" +#include "ash/wm/workspace/workspace_layout_manager.h" +#include "ash/wm/workspace_controller.h" #include "base/command_line.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 660b2cf8..43357016 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h
@@ -11,8 +11,8 @@ #include "ash/ash_export.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/workspace/workspace_types.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/wm/workspace/workspace_types.h" #include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h"
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index c662a1f5..3e4eb29e 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc
@@ -8,15 +8,15 @@ #include "ash/common/session/session_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/system_modal_container_layout_manager.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h"
diff --git a/ash/screen_util.cc b/ash/screen_util.cc index ea11d87..d7c7c83 100644 --- a/ash/screen_util.cc +++ b/ash/screen_util.cc
@@ -4,8 +4,8 @@ #include "ash/screen_util.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "base/logging.h" #include "ui/aura/client/screen_position_client.h"
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc index 149c18b..9646cbaa 100644 --- a/ash/screen_util_unittest.cc +++ b/ash/screen_util_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/screen_util.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_screen_util.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/common/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc similarity index 96% rename from ash/common/shelf/app_list_button.cc rename to ash/shelf/app_list_button.cc index c9e3d30..6d2fb33 100644 --- a/ash/common/shelf/app_list_button.cc +++ b/ash/shelf/app_list_button.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/app_list_button.h" +#include "ash/shelf/app_list_button.h" -#include "ash/common/shelf/ink_drop_button_listener.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/ink_drop_button_listener.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/tray_popup_utils.h" #include "base/memory/ptr_util.h"
diff --git a/ash/common/shelf/app_list_button.h b/ash/shelf/app_list_button.h similarity index 94% rename from ash/common/shelf/app_list_button.h rename to ash/shelf/app_list_button.h index d4a0fbe..494017b2 100644 --- a/ash/common/shelf/app_list_button.h +++ b/ash/shelf/app_list_button.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_APP_LIST_BUTTON_H_ -#define ASH_COMMON_SHELF_APP_LIST_BUTTON_H_ +#ifndef ASH_SHELF_APP_LIST_BUTTON_H_ +#define ASH_SHELF_APP_LIST_BUTTON_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -69,4 +69,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_APP_LIST_BUTTON_H_ +#endif // ASH_SHELF_APP_LIST_BUTTON_H_
diff --git a/ash/common/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc similarity index 94% rename from ash/common/shelf/app_list_shelf_item_delegate.cc rename to ash/shelf/app_list_shelf_item_delegate.cc index 425ffecc..b2ba8a2 100644 --- a/ash/common/shelf/app_list_shelf_item_delegate.cc +++ b/ash/shelf/app_list_shelf_item_delegate.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/app_list_shelf_item_delegate.h" +#include "ash/shelf/app_list_shelf_item_delegate.h" -#include "ash/common/shelf/shelf_model.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_model.h" #include "ash/strings/grit/ash_strings.h" #include "base/memory/ptr_util.h" #include "ui/app_list/app_list_switches.h"
diff --git a/ash/common/shelf/app_list_shelf_item_delegate.h b/ash/shelf/app_list_shelf_item_delegate.h similarity index 82% rename from ash/common/shelf/app_list_shelf_item_delegate.h rename to ash/shelf/app_list_shelf_item_delegate.h index 88f09d2..0f52bf6 100644 --- a/ash/common/shelf/app_list_shelf_item_delegate.h +++ b/ash/shelf/app_list_shelf_item_delegate.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ -#define ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ +#ifndef ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ +#define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ -#include "ash/common/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" #include "base/macros.h" namespace ash { @@ -36,4 +36,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ +#endif // ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
diff --git a/ash/common/shelf/ink_drop_button_listener.h b/ash/shelf/ink_drop_button_listener.h similarity index 87% rename from ash/common/shelf/ink_drop_button_listener.h rename to ash/shelf/ink_drop_button_listener.h index 4b6e752..48b10ae 100644 --- a/ash/common/shelf/ink_drop_button_listener.h +++ b/ash/shelf/ink_drop_button_listener.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_ -#define ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_ +#ifndef ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_ +#define ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_ #include "ash/ash_export.h" @@ -38,4 +38,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_ +#endif // ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_
diff --git a/ash/common/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc similarity index 91% rename from ash/common/shelf/overflow_bubble.cc rename to ash/shelf/overflow_bubble.cc index 313b3e1..2f09f860 100644 --- a/ash/common/shelf/overflow_bubble.cc +++ b/ash/shelf/overflow_bubble.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/overflow_bubble.h" +#include "ash/shelf/overflow_bubble.h" -#include "ash/common/shelf/overflow_bubble_view.h" -#include "ash/common/shelf/overflow_button.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/overflow_bubble_view.h" +#include "ash/shelf/overflow_button.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/tray/tray_background_view.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/shelf/overflow_bubble.h b/ash/shelf/overflow_bubble.h similarity index 93% rename from ash/common/shelf/overflow_bubble.h rename to ash/shelf/overflow_bubble.h index 201018c..d6afdf83 100644 --- a/ash/common/shelf/overflow_bubble.h +++ b/ash/shelf/overflow_bubble.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_ -#define ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_ +#ifndef ASH_SHELF_OVERFLOW_BUBBLE_H_ +#define ASH_SHELF_OVERFLOW_BUBBLE_H_ #include "base/macros.h" #include "ui/views/pointer_watcher.h" @@ -62,4 +62,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_ +#endif // ASH_SHELF_OVERFLOW_BUBBLE_H_
diff --git a/ash/common/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc similarity index 97% rename from ash/common/shelf/overflow_bubble_view.cc rename to ash/shelf/overflow_bubble_view.cc index ebee64e..80d8f09 100644 --- a/ash/common/shelf/overflow_bubble_view.cc +++ b/ash/shelf/overflow_bubble_view.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/overflow_bubble_view.h" +#include "ash/shelf/overflow_bubble_view.h" #include <algorithm> -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/events/event.h"
diff --git a/ash/common/shelf/overflow_bubble_view.h b/ash/shelf/overflow_bubble_view.h similarity index 92% rename from ash/common/shelf/overflow_bubble_view.h rename to ash/shelf/overflow_bubble_view.h index f9c1678..1e2ae83 100644 --- a/ash/common/shelf/overflow_bubble_view.h +++ b/ash/shelf/overflow_bubble_view.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_ -#define ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_ +#ifndef ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_ +#define ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -66,4 +66,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_ +#endif // ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
diff --git a/ash/common/shelf/overflow_button.cc b/ash/shelf/overflow_button.cc similarity index 96% rename from ash/common/shelf/overflow_button.cc rename to ash/shelf/overflow_button.cc index ccb585c..e7944aa 100644 --- a/ash/common/shelf/overflow_button.cc +++ b/ash/shelf/overflow_button.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/overflow_button.h" +#include "ash/shelf/overflow_button.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "base/memory/ptr_util.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/common/shelf/overflow_button.h b/ash/shelf/overflow_button.h similarity index 93% rename from ash/common/shelf/overflow_button.h rename to ash/shelf/overflow_button.h index 32bf382..aaca229 100644 --- a/ash/common/shelf/overflow_button.h +++ b/ash/shelf/overflow_button.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_ -#define ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_ +#ifndef ASH_SHELF_OVERFLOW_BUTTON_H_ +#define ASH_SHELF_OVERFLOW_BUTTON_H_ #include "base/macros.h" #include "ui/gfx/geometry/rect.h" @@ -64,4 +64,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_ +#endif // ASH_SHELF_OVERFLOW_BUTTON_H_
diff --git a/ash/common/shelf/shelf_alignment_menu.cc b/ash/shelf/shelf_alignment_menu.cc similarity index 93% rename from ash/common/shelf/shelf_alignment_menu.cc rename to ash/shelf/shelf_alignment_menu.cc index 12c48b2..5429b4e 100644 --- a/ash/common/shelf/shelf_alignment_menu.cc +++ b/ash/shelf/shelf_alignment_menu.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_alignment_menu.h" +#include "ash/shelf/shelf_alignment_menu.h" -#include "ash/common/metrics/user_metrics_action.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" namespace ash {
diff --git a/ash/common/shelf/shelf_alignment_menu.h b/ash/shelf/shelf_alignment_menu.h similarity index 87% rename from ash/common/shelf/shelf_alignment_menu.h rename to ash/shelf/shelf_alignment_menu.h index e315317..ddbdcda 100644 --- a/ash/common/shelf/shelf_alignment_menu.h +++ b/ash/shelf/shelf_alignment_menu.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ -#define ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ +#ifndef ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ +#define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -40,4 +40,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ +#endif // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
diff --git a/ash/common/shelf/shelf_application_menu_model.cc b/ash/shelf/shelf_application_menu_model.cc similarity index 95% rename from ash/common/shelf/shelf_application_menu_model.cc rename to ash/shelf/shelf_application_menu_model.cc index 7bf323c..672c6a8 100644 --- a/ash/common/shelf/shelf_application_menu_model.cc +++ b/ash/shelf/shelf_application_menu_model.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_application_menu_model.h" +#include "ash/shelf/shelf_application_menu_model.h" #include <stddef.h> #include <limits> #include <utility> -#include "ash/common/shelf/shelf_item_delegate.h" #include "ash/public/cpp/shelf_application_menu_item.h" +#include "ash/shelf/shelf_item_delegate.h" #include "base/metrics/histogram_macros.h" namespace {
diff --git a/ash/common/shelf/shelf_application_menu_model.h b/ash/shelf/shelf_application_menu_model.h similarity index 91% rename from ash/common/shelf/shelf_application_menu_model.h rename to ash/shelf/shelf_application_menu_model.h index 7abe8b5..2093ddd7 100644 --- a/ash/common/shelf/shelf_application_menu_model.h +++ b/ash/shelf/shelf_application_menu_model.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_ -#define ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_ +#ifndef ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_ +#define ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_ #include <memory> #include <vector> @@ -61,4 +61,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_ +#endif // ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
diff --git a/ash/common/shelf/shelf_application_menu_model_unittest.cc b/ash/shelf/shelf_application_menu_model_unittest.cc similarity index 97% rename from ash/common/shelf/shelf_application_menu_model_unittest.cc rename to ash/shelf/shelf_application_menu_model_unittest.cc index aebee58..b2b7c0e 100644 --- a/ash/common/shelf/shelf_application_menu_model_unittest.cc +++ b/ash/shelf/shelf_application_menu_model_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_application_menu_model.h" +#include "ash/shelf/shelf_application_menu_model.h" #include <utility> -#include "ash/common/test/test_shelf_item_delegate.h" #include "ash/public/cpp/shelf_application_menu_item.h" +#include "ash/test/test_shelf_item_delegate.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/common/shelf/shelf_background_animator.cc b/ash/shelf/shelf_background_animator.cc similarity index 97% rename from ash/common/shelf/shelf_background_animator.cc rename to ash/shelf/shelf_background_animator.cc index ad0311e..00b3347c 100644 --- a/ash/common/shelf/shelf_background_animator.cc +++ b/ash/shelf/shelf_background_animator.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_background_animator.h" +#include "ash/shelf/shelf_background_animator.h" #include <algorithm> #include "ash/animation/animation_change_type.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wallpaper/wallpaper_controller.h" +#include "ash/shelf/shelf_background_animator_observer.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/color_utils.h"
diff --git a/ash/common/shelf/shelf_background_animator.h b/ash/shelf/shelf_background_animator.h similarity index 96% rename from ash/common/shelf/shelf_background_animator.h rename to ash/shelf/shelf_background_animator.h index 72747494..a12fe842 100644 --- a/ash/common/shelf/shelf_background_animator.h +++ b/ash/shelf/shelf_background_animator.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ -#define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ +#ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ +#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ #include <memory> #include <vector> #include "ash/ash_export.h" -#include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/wallpaper/wallpaper_controller_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf_observer.h" #include "base/macros.h" #include "base/observer_list.h" #include "third_party/skia/include/core/SkColor.h" @@ -184,4 +184,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ +#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
diff --git a/ash/common/shelf/shelf_background_animator_observer.h b/ash/shelf/shelf_background_animator_observer.h similarity index 78% rename from ash/common/shelf/shelf_background_animator_observer.h rename to ash/shelf/shelf_background_animator_observer.h index bf8ca105..6c45073 100644 --- a/ash/common/shelf/shelf_background_animator_observer.h +++ b/ash/shelf/shelf_background_animator_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_ -#define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_ +#ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_ +#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_ #include "ash/ash_export.h" #include "third_party/skia/include/core/SkColor.h" @@ -25,4 +25,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_ +#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
diff --git a/ash/common/shelf/shelf_background_animator_unittest.cc b/ash/shelf/shelf_background_animator_unittest.cc similarity index 98% rename from ash/common/shelf/shelf_background_animator_unittest.cc rename to ash/shelf/shelf_background_animator_unittest.cc index 9a3784c..5431ca6a 100644 --- a/ash/common/shelf/shelf_background_animator_unittest.cc +++ b/ash/shelf/shelf_background_animator_unittest.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_background_animator.h" +#include "ash/shelf/shelf_background_animator.h" #include <memory> #include "ash/animation/animation_change_type.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_constants.h" #include "ash/common/wallpaper/wallpaper_controller.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_background_animator_observer.h" +#include "ash/shelf/shelf_constants.h" #include "base/bind.h" #include "base/macros.h" #include "base/test/test_mock_time_task_runner.h"
diff --git a/ash/shelf/shelf_bezel_event_handler.cc b/ash/shelf/shelf_bezel_event_handler.cc index da40409..fa2b5f97 100644 --- a/ash/shelf/shelf_bezel_event_handler.cc +++ b/ash/shelf/shelf_bezel_event_handler.cc
@@ -4,7 +4,7 @@ #include "ash/shelf/shelf_bezel_event_handler.h" -#include "ash/common/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ui/aura/window.h" #include "ui/display/display.h"
diff --git a/ash/common/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc similarity index 98% rename from ash/common/shelf/shelf_button.cc rename to ash/shelf/shelf_button.cc index d5d32ff7..bcd86583 100644 --- a/ash/common/shelf/shelf_button.cc +++ b/ash/shelf/shelf_button.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_button.h" +#include "ash/shelf/shelf_button.h" #include <algorithm> #include "ash/common/ash_constants.h" -#include "ash/common/shelf/ink_drop_button_listener.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" +#include "ash/shelf/ink_drop_button_listener.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "base/memory/ptr_util.h" #include "base/time/time.h" #include "skia/ext/image_operations.h"
diff --git a/ash/common/shelf/shelf_button.h b/ash/shelf/shelf_button.h similarity index 96% rename from ash/common/shelf/shelf_button.h rename to ash/shelf/shelf_button.h index 4f828ea18..540d20ac 100644 --- a/ash/common/shelf/shelf_button.h +++ b/ash/shelf/shelf_button.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_BUTTON_H_ -#define ASH_COMMON_SHELF_SHELF_BUTTON_H_ +#ifndef ASH_SHELF_SHELF_BUTTON_H_ +#define ASH_SHELF_SHELF_BUTTON_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -126,4 +126,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_BUTTON_H_ +#endif // ASH_SHELF_SHELF_BUTTON_H_
diff --git a/ash/common/shelf/shelf_button_pressed_metric_tracker.cc b/ash/shelf/shelf_button_pressed_metric_tracker.cc similarity index 97% rename from ash/common/shelf/shelf_button_pressed_metric_tracker.cc rename to ash/shelf/shelf_button_pressed_metric_tracker.cc index a27ff74..0724cf6 100644 --- a/ash/common/shelf/shelf_button_pressed_metric_tracker.cc +++ b/ash/shelf/shelf_button_pressed_metric_tracker.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h" +#include "ash/shelf/shelf_button_pressed_metric_tracker.h" #include "ash/common/wm_shell.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/common/shelf/shelf_button_pressed_metric_tracker.h b/ash/shelf/shelf_button_pressed_metric_tracker.h similarity index 91% rename from ash/common/shelf/shelf_button_pressed_metric_tracker.h rename to ash/shelf/shelf_button_pressed_metric_tracker.h index 5cf1991..4c9044b 100644 --- a/ash/common/shelf/shelf_button_pressed_metric_tracker.h +++ b/ash/shelf/shelf_button_pressed_metric_tracker.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_ -#define ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_ +#ifndef ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_ +#define ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" #include "base/macros.h" #include "base/time/tick_clock.h" #include "base/time/time.h" @@ -88,4 +88,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_ +#endif // ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
diff --git a/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc similarity index 98% rename from ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc rename to ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc index 2461306..1cc2879 100644 --- a/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc +++ b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h" +#include "ash/shelf/shelf_button_pressed_metric_tracker.h" #include <utility> -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h" #include "ash/test/shelf_view_test_api.h"
diff --git a/ash/common/shelf/shelf_constants.cc b/ash/shelf/shelf_constants.cc similarity index 96% rename from ash/common/shelf/shelf_constants.cc rename to ash/shelf/shelf_constants.cc index 80aafcd1..1d43a73c 100644 --- a/ash/common/shelf/shelf_constants.cc +++ b/ash/shelf/shelf_constants.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_constants.h" +#include "ash/shelf/shelf_constants.h" #include "base/logging.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/common/shelf/shelf_constants.h b/ash/shelf/shelf_constants.h similarity index 95% rename from ash/common/shelf/shelf_constants.h rename to ash/shelf/shelf_constants.h index bc783fe..9be93c81 100644 --- a/ash/common/shelf/shelf_constants.h +++ b/ash/shelf/shelf_constants.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ -#define ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ +#ifndef ASH_SHELF_SHELF_CONSTANTS_H_ +#define ASH_SHELF_SHELF_CONSTANTS_H_ #include "ash/ash_export.h" #include "third_party/skia/include/core/SkColor.h" @@ -79,4 +79,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ +#endif // ASH_SHELF_SHELF_CONSTANTS_H_
diff --git a/ash/common/shelf/shelf_controller.cc b/ash/shelf/shelf_controller.cc similarity index 98% rename from ash/common/shelf/shelf_controller.cc rename to ash/shelf/shelf_controller.cc index 5bfece4..4a0130d 100644 --- a/ash/common/shelf/shelf_controller.cc +++ b/ash/shelf/shelf_controller.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_controller.h" +#include "ash/shelf/shelf_controller.h" -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/ash/common/shelf/shelf_controller.h b/ash/shelf/shelf_controller.h similarity index 91% rename from ash/common/shelf/shelf_controller.h rename to ash/shelf/shelf_controller.h index b058d4f..de4a19ac 100644 --- a/ash/common/shelf/shelf_controller.h +++ b/ash/shelf/shelf_controller.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_CONTROLLER_H_ -#define ASH_COMMON_SHELF_SHELF_CONTROLLER_H_ +#ifndef ASH_SHELF_SHELF_CONTROLLER_H_ +#define ASH_SHELF_SHELF_CONTROLLER_H_ #include <map> #include <string> -#include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/shelf/shelf_model.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/interfaces/shelf.mojom.h" +#include "ash/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_model.h" #include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/interface_ptr_set.h" @@ -73,4 +73,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_CONTROLLER_H_ +#endif // ASH_SHELF_SHELF_CONTROLLER_H_
diff --git a/ash/common/shelf/shelf_delegate.h b/ash/shelf/shelf_delegate.h similarity index 90% rename from ash/common/shelf/shelf_delegate.h rename to ash/shelf/shelf_delegate.h index 8f83b16..a19facb 100644 --- a/ash/common/shelf/shelf_delegate.h +++ b/ash/shelf/shelf_delegate.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_DELEGATE_H_ -#define ASH_COMMON_SHELF_SHELF_DELEGATE_H_ +#ifndef ASH_SHELF_SHELF_DELEGATE_H_ +#define ASH_SHELF_SHELF_DELEGATE_H_ #include <string> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" namespace ash { @@ -52,4 +52,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_DELEGATE_H_ +#endif // ASH_SHELF_SHELF_DELEGATE_H_
diff --git a/ash/common/shelf/shelf_item_delegate.cc b/ash/shelf/shelf_item_delegate.cc similarity index 91% rename from ash/common/shelf/shelf_item_delegate.cc rename to ash/shelf/shelf_item_delegate.cc index bc3ec8c3..9eb63c2 100644 --- a/ash/common/shelf/shelf_item_delegate.cc +++ b/ash/shelf/shelf_item_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" #include "ui/display/types/display_constants.h"
diff --git a/ash/common/shelf/shelf_item_delegate.h b/ash/shelf/shelf_item_delegate.h similarity index 92% rename from ash/common/shelf/shelf_item_delegate.h rename to ash/shelf/shelf_item_delegate.h index 8ff4aed..028d588 100644 --- a/ash/common/shelf/shelf_item_delegate.h +++ b/ash/shelf/shelf_item_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_ -#define ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_ +#ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_H_ +#define ASH_SHELF_SHELF_ITEM_DELEGATE_H_ #include <stdint.h> @@ -48,4 +48,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_ +#endif // ASH_SHELF_SHELF_ITEM_DELEGATE_H_
diff --git a/ash/common/shelf/shelf_item_types.cc b/ash/shelf/shelf_item_types.cc similarity index 86% rename from ash/common/shelf/shelf_item_types.cc rename to ash/shelf/shelf_item_types.cc index 36baad1..6345fde 100644 --- a/ash/common/shelf/shelf_item_types.cc +++ b/ash/shelf/shelf_item_types.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" namespace ash {
diff --git a/ash/common/shelf/shelf_item_types.h b/ash/shelf/shelf_item_types.h similarity index 89% rename from ash/common/shelf/shelf_item_types.h rename to ash/shelf/shelf_item_types.h index 62d279eb..ab587d3 100644 --- a/ash/common/shelf/shelf_item_types.h +++ b/ash/shelf/shelf_item_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ -#define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ +#ifndef ASH_SHELF_SHELF_ITEM_TYPES_H_ +#define ASH_SHELF_SHELF_ITEM_TYPES_H_ // TODO(msw): Rename these files to shelf_item.*; audit users. @@ -50,4 +50,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ +#endif // ASH_SHELF_SHELF_ITEM_TYPES_H_
diff --git a/ash/common/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc similarity index 98% rename from ash/common/shelf/shelf_layout_manager.cc rename to ash/shelf/shelf_layout_manager.cc index 5849bb7..fcd8036c 100644 --- a/ash/common/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_layout_manager.h" #include <algorithm> #include <cmath> @@ -11,19 +11,19 @@ #include "ash/animation/animation_change_type.h" #include "ash/common/session/session_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_layout_manager_observer.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_layout_manager_observer.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/status_area_widget.h" +#include "ash/wm/fullscreen_window_finder.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_screen_util.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/i18n/rtl.h"
diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h similarity index 96% rename from ash/common/shelf/shelf_layout_manager.h rename to ash/shelf/shelf_layout_manager.h index 87f598a..505cf0e 100644 --- a/ash/common/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h
@@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ -#define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ +#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ +#define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ #include <memory> #include "ash/ash_export.h" #include "ash/common/session/session_state_observer.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/dock/docked_window_layout_manager_observer.h" -#include "ash/common/wm/lock_state_observer.h" -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" -#include "ash/common/wm/workspace/workspace_types.h" #include "ash/common/wm_activation_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/dock/docked_window_layout_manager_observer.h" +#include "ash/wm/lock_state_observer.h" +#include "ash/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/wm/workspace/workspace_types.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/timer/timer.h" @@ -362,4 +362,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ +#endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
diff --git a/ash/common/shelf/shelf_layout_manager_observer.h b/ash/shelf/shelf_layout_manager_observer.h similarity index 80% rename from ash/common/shelf/shelf_layout_manager_observer.h rename to ash/shelf/shelf_layout_manager_observer.h index 00d03b13..8aac32d 100644 --- a/ash/common/shelf/shelf_layout_manager_observer.h +++ b/ash/shelf/shelf_layout_manager_observer.h
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ -#define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ +#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ +#define ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_background_animator.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_background_animator.h" namespace ash { @@ -33,4 +33,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ +#endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index ad2ee17b..cb32ca3 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -2,22 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_layout_manager.h" -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_table.h" #include "ash/common/focus_cycler.h" #include "ash/common/session/session_controller.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_layout_manager_observer.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_layout_manager_observer.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray.h" @@ -26,6 +25,7 @@ #include "ash/test/test_app_list_view_presenter_impl.h" #include "ash/test/test_system_tray_item.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h"
diff --git a/ash/common/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc similarity index 95% rename from ash/common/shelf/shelf_locking_manager.cc rename to ash/shelf/shelf_locking_manager.cc index aabc145..362eedc 100644 --- a/ash/common/shelf/shelf_locking_manager.cc +++ b/ash/shelf/shelf_locking_manager.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_locking_manager.h" +#include "ash/shelf/shelf_locking_manager.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/wm_shelf.h" namespace ash {
diff --git a/ash/common/shelf/shelf_locking_manager.h b/ash/shelf/shelf_locking_manager.h similarity index 87% rename from ash/common/shelf/shelf_locking_manager.h rename to ash/shelf/shelf_locking_manager.h index 2bf015e..b40e2bb 100644 --- a/ash/common/shelf/shelf_locking_manager.h +++ b/ash/shelf/shelf_locking_manager.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_ -#define ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_ +#ifndef ASH_SHELF_SHELF_LOCKING_MANAGER_H_ +#define ASH_SHELF_SHELF_LOCKING_MANAGER_H_ #include "ash/ash_export.h" #include "ash/common/session/session_state_observer.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/lock_state_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/wm/lock_state_observer.h" namespace ash { @@ -49,4 +49,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_ +#endif // ASH_SHELF_SHELF_LOCKING_MANAGER_H_
diff --git a/ash/common/shelf/shelf_locking_manager_unittest.cc b/ash/shelf/shelf_locking_manager_unittest.cc similarity index 96% rename from ash/common/shelf/shelf_locking_manager_unittest.cc rename to ash/shelf/shelf_locking_manager_unittest.cc index d225a937..7d57160e 100644 --- a/ash/common/shelf/shelf_locking_manager_unittest.cc +++ b/ash/shelf/shelf_locking_manager_unittest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_locking_manager.h" +#include "ash/shelf/shelf_locking_manager.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" namespace ash {
diff --git a/ash/common/shelf/shelf_model.cc b/ash/shelf/shelf_model.cc similarity index 97% rename from ash/common/shelf/shelf_model.cc rename to ash/shelf/shelf_model.cc index a6844758..7c6e281f 100644 --- a/ash/common/shelf/shelf_model.cc +++ b/ash/shelf/shelf_model.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_model.h" +#include "ash/shelf/shelf_model.h" #include <algorithm> -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_model_observer.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_model_observer.h" namespace ash {
diff --git a/ash/common/shelf/shelf_model.h b/ash/shelf/shelf_model.h similarity index 95% rename from ash/common/shelf/shelf_model.h rename to ash/shelf/shelf_model.h index a5f61e80..727e23fa 100644 --- a/ash/common/shelf/shelf_model.h +++ b/ash/shelf/shelf_model.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_MODEL_H_ -#define ASH_COMMON_SHELF_SHELF_MODEL_H_ +#ifndef ASH_SHELF_SHELF_MODEL_H_ +#define ASH_SHELF_SHELF_MODEL_H_ #include <map> #include <memory> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" #include "base/macros.h" #include "base/observer_list.h" @@ -108,4 +108,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_MODEL_H_ +#endif // ASH_SHELF_SHELF_MODEL_H_
diff --git a/ash/common/shelf/shelf_model_observer.h b/ash/shelf/shelf_model_observer.h similarity index 87% rename from ash/common/shelf/shelf_model_observer.h rename to ash/shelf/shelf_model_observer.h index 794300d..70e7156 100644 --- a/ash/common/shelf/shelf_model_observer.h +++ b/ash/shelf/shelf_model_observer.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_ -#define ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_ +#ifndef ASH_SHELF_SHELF_MODEL_OBSERVER_H_ +#define ASH_SHELF_SHELF_MODEL_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" namespace ash { @@ -43,4 +43,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_ +#endif // ASH_SHELF_SHELF_MODEL_OBSERVER_H_
diff --git a/ash/common/shelf/shelf_model_unittest.cc b/ash/shelf/shelf_model_unittest.cc similarity index 98% rename from ash/common/shelf/shelf_model_unittest.cc rename to ash/shelf/shelf_model_unittest.cc index 9589da1..30e6af8 100644 --- a/ash/common/shelf/shelf_model_unittest.cc +++ b/ash/shelf/shelf_model_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_model.h" +#include "ash/shelf/shelf_model.h" #include <set> #include <string> -#include "ash/common/shelf/shelf_model_observer.h" +#include "ash/shelf/shelf_model_observer.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/common/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc similarity index 98% rename from ash/common/shelf/shelf_tooltip_manager.cc rename to ash/shelf/shelf_tooltip_manager.cc index 8cab3d3..59988c8 100644 --- a/ash/common/shelf/shelf_tooltip_manager.cc +++ b/ash/shelf/shelf_tooltip_manager.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_tooltip_manager.h" +#include "ash/shelf/shelf_tooltip_manager.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/tray/tray_constants.h" #include "base/bind.h" #include "base/strings/string16.h"
diff --git a/ash/common/shelf/shelf_tooltip_manager.h b/ash/shelf/shelf_tooltip_manager.h similarity index 92% rename from ash/common/shelf/shelf_tooltip_manager.h rename to ash/shelf/shelf_tooltip_manager.h index c68a1b0..b2619aa 100644 --- a/ash/common/shelf/shelf_tooltip_manager.h +++ b/ash/shelf/shelf_tooltip_manager.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_TOOLTIP_MANAGER_H_ -#define ASH_COMMON_SHELF_SHELF_TOOLTIP_MANAGER_H_ +#ifndef ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ +#define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ #include "ash/ash_export.h" -#include "ash/common/shelf/wm_shelf_observer.h" +#include "ash/shelf/wm_shelf_observer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" @@ -87,4 +87,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_TOOLTIP_MANAGER_H_ +#endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
diff --git a/ash/common/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc similarity index 96% rename from ash/common/shelf/shelf_tooltip_manager_unittest.cc rename to ash/shelf/shelf_tooltip_manager_unittest.cc index 955301fd..9f308d3 100644 --- a/ash/common/shelf/shelf_tooltip_manager_unittest.cc +++ b/ash/shelf/shelf_tooltip_manager_unittest.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_tooltip_manager.h" +#include "ash/shelf/shelf_tooltip_manager.h" -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_item_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" +#include "ash/test/test_shelf_item_delegate.h" #include "base/memory/ptr_util.h" #include "ui/events/event_constants.h" #include "ui/events/test/event_generator.h"
diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc index 060018c6..a483cd8 100644 --- a/ash/shelf/shelf_unittest.cc +++ b/ash/shelf/shelf_unittest.cc
@@ -4,14 +4,14 @@ #include <utility> -#include "ash/common/shelf/shelf_button.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_item_delegate.h" +#include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" +#include "ash/test/test_shelf_item_delegate.h" namespace ash {
diff --git a/ash/common/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc similarity index 98% rename from ash/common/shelf/shelf_view.cc rename to ash/shelf/shelf_view.cc index c46b168b..95e8ced 100644 --- a/ash/common/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc
@@ -2,30 +2,30 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_view.h" +#include "ash/shelf/shelf_view.h" #include <algorithm> #include <memory> #include "ash/common/ash_constants.h" -#include "ash/common/drag_drop/drag_image_view.h" #include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/overflow_bubble.h" -#include "ash/common/shelf/overflow_bubble_view.h" -#include "ash/common/shelf/overflow_button.h" -#include "ash/common/shelf/shelf_application_menu_model.h" -#include "ash/common/shelf/shelf_button.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_delegate.h" -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/drag_drop/drag_image_view.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/overflow_bubble.h" +#include "ash/shelf/overflow_bubble_view.h" +#include "ash/shelf/overflow_button.h" +#include "ash/shelf/shelf_application_menu_model.h" +#include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm/root_window_finder.h" #include "base/auto_reset.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/common/shelf/shelf_view.h b/ash/shelf/shelf_view.h similarity index 97% rename from ash/common/shelf/shelf_view.h rename to ash/shelf/shelf_view.h index 3f1858b..1355fc7 100644 --- a/ash/common/shelf/shelf_view.h +++ b/ash/shelf/shelf_view.h
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_VIEW_H_ -#define ASH_COMMON_SHELF_SHELF_VIEW_H_ +#ifndef ASH_SHELF_SHELF_VIEW_H_ +#define ASH_SHELF_SHELF_VIEW_H_ #include <memory> #include <string> #include <utility> #include <vector> -#include "ash/common/shelf/ink_drop_button_listener.h" -#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h" -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_model_observer.h" -#include "ash/common/shelf/shelf_tooltip_manager.h" +#include "ash/shelf/ink_drop_button_listener.h" +#include "ash/shelf/shelf_button_pressed_metric_tracker.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_model_observer.h" +#include "ash/shelf/shelf_tooltip_manager.h" #include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/app_list/views/app_list_drag_and_drop_host.h" @@ -467,4 +467,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_VIEW_H_ +#endif // ASH_SHELF_SHELF_VIEW_H_
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index 7903fa9..e2716f91 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc
@@ -2,38 +2,38 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_view.h" +#include "ash/shelf/shelf_view.h" #include <algorithm> #include <memory> #include <utility> #include <vector> -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/overflow_bubble.h" -#include "ash/common/shelf/overflow_bubble_view.h" -#include "ash/common/shelf/overflow_button.h" -#include "ash/common/shelf/shelf_button.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_tooltip_manager.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_observer.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/test/test_shelf_item_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/overflow_bubble.h" +#include "ash/shelf/overflow_bubble_view.h" +#include "ash/shelf/overflow_button.h" +#include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_tooltip_manager.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_observer.h" #include "ash/shell.h" #include "ash/system/web_notification/web_notification_tray.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "ash/test/overflow_bubble_view_test_api.h" #include "ash/test/shelf_view_test_api.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/test/test_shelf_item_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/test/test_system_tray_delegate.h" #include "base/i18n/rtl.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ash/common/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc similarity index 96% rename from ash/common/shelf/shelf_widget.cc rename to ash/shelf/shelf_widget.cc index 0bbfb54..8568cea6 100644 --- a/ash/common/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc
@@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_widget.h" +#include "ash/shelf/shelf_widget.h" #include "ash/animation/animation_change_type.h" #include "ash/common/focus_cycler.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_background_animator_observer.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/status_area_layout_manager.h" #include "ash/system/status_area_widget.h" #include "ash/wm/window_properties.h"
diff --git a/ash/common/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h similarity index 92% rename from ash/common/shelf/shelf_widget.h rename to ash/shelf/shelf_widget.h index e77b9d8..0b9097cc 100644 --- a/ash/common/shelf/shelf_widget.h +++ b/ash/shelf/shelf_widget.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_ -#define ASH_COMMON_SHELF_SHELF_WIDGET_H_ +#ifndef ASH_SHELF_SHELF_WIDGET_H_ +#define ASH_SHELF_SHELF_WIDGET_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_background_animator.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_layout_manager_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_background_animator.h" +#include "ash/shelf/shelf_background_animator_observer.h" +#include "ash/shelf/shelf_layout_manager_observer.h" #include "base/macros.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" @@ -127,4 +127,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_ +#endif // ASH_SHELF_SHELF_WIDGET_H_
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index 8b9c474..4e4f4f8 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_widget.h" +#include "ash/shelf/shelf_widget.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" #include "ash/test/ash_test_base.h"
diff --git a/ash/shelf/shelf_window_targeter.cc b/ash/shelf/shelf_window_targeter.cc index 24ba0e8..d881be7 100644 --- a/ash/shelf/shelf_window_targeter.cc +++ b/ash/shelf/shelf_window_targeter.cc
@@ -4,10 +4,10 @@ #include "ash/shelf/shelf_window_targeter.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/shelf/shelf_window_targeter.h b/ash/shelf/shelf_window_targeter.h index fd14fe1..d8c58673 100644 --- a/ash/shelf/shelf_window_targeter.h +++ b/ash/shelf/shelf_window_targeter.h
@@ -5,7 +5,7 @@ #ifndef ASH_SHELF_SHELF_WINDOW_TARGETER_H_ #define ASH_SHELF_SHELF_WINDOW_TARGETER_H_ -#include "ash/common/shelf/wm_shelf_observer.h" +#include "ash/shelf/wm_shelf_observer.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/wm/core/easy_resize_window_targeter.h"
diff --git a/ash/common/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc similarity index 97% rename from ash/common/shelf/shelf_window_watcher.cc rename to ash/shelf/shelf_window_watcher.cc index 7a00df9d..2f607f8 100644 --- a/ash/common/shelf/shelf_window_watcher.cc +++ b/ash/shelf/shelf_window_watcher.cc
@@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_window_watcher.h" +#include "ash/shelf/shelf_window_watcher.h" #include <memory> #include <utility> -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_window_watcher_item_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_window_watcher_item_delegate.h" #include "ash/shell.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/common/shelf/shelf_window_watcher.h b/ash/shelf/shelf_window_watcher.h similarity index 96% rename from ash/common/shelf/shelf_window_watcher.h rename to ash/shelf/shelf_window_watcher.h index c683f39..31c18f2 100644 --- a/ash/common/shelf/shelf_window_watcher.h +++ b/ash/shelf/shelf_window_watcher.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_ -#define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_ +#ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_ +#define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ #include <set> @@ -117,4 +117,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_ +#endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.cc b/ash/shelf/shelf_window_watcher_item_delegate.cc similarity index 91% rename from ash/common/shelf/shelf_window_watcher_item_delegate.cc rename to ash/shelf/shelf_window_watcher_item_delegate.cc index 01f4bd4..fbd905b 100644 --- a/ash/common/shelf/shelf_window_watcher_item_delegate.cc +++ b/ash/shelf/shelf_window_watcher_item_delegate.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_window_watcher_item_delegate.h" +#include "ash/shelf/shelf_window_watcher_item_delegate.h" -#include "ash/common/shelf/shelf_controller.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" +#include "ash/shelf/shelf_controller.h" +#include "ash/shelf/shelf_model.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h" #include "ui/events/event_constants.h"
diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h similarity index 82% rename from ash/common/shelf/shelf_window_watcher_item_delegate.h rename to ash/shelf/shelf_window_watcher_item_delegate.h index fd61f439..4fa1d47d 100644 --- a/ash/common/shelf/shelf_window_watcher_item_delegate.h +++ b/ash/shelf/shelf_window_watcher_item_delegate.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ -#define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ +#ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ +#define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ -#include "ash/common/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" #include "base/macros.h" namespace ash { @@ -38,4 +38,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ +#endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
diff --git a/ash/common/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc similarity index 98% rename from ash/common/shelf/shelf_window_watcher_unittest.cc rename to ash/shelf/shelf_window_watcher_unittest.cc index f88eaa1..3f104c19 100644 --- a/ash/common/shelf/shelf_window_watcher_unittest.cc +++ b/ash/shelf/shelf_window_watcher_unittest.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_window_watcher.h" +#include "ash/shelf/shelf_window_watcher.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_model.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/window_state.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/shelf/wm_shelf.cc b/ash/shelf/wm_shelf.cc similarity index 96% rename from ash/common/shelf/wm_shelf.cc rename to ash/shelf/wm_shelf.cc index 456af77..fdd2aeb 100644 --- a/ash/common/shelf/wm_shelf.cc +++ b/ash/shelf/wm_shelf.cc
@@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf.h" -#include "ash/common/shelf/shelf_controller.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_locking_manager.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_bezel_event_handler.h" +#include "ash/shelf/shelf_controller.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_locking_manager.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf_observer.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "base/logging.h"
diff --git a/ash/common/shelf/wm_shelf.h b/ash/shelf/wm_shelf.h similarity index 97% rename from ash/common/shelf/wm_shelf.h rename to ash/shelf/wm_shelf.h index b2e858a..491f35e 100644 --- a/ash/common/shelf/wm_shelf.h +++ b/ash/shelf/wm_shelf.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_WM_SHELF_H_ -#define ASH_COMMON_SHELF_WM_SHELF_H_ +#ifndef ASH_SHELF_WM_SHELF_H_ +#define ASH_SHELF_WM_SHELF_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_layout_manager_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_layout_manager_observer.h" #include "base/observer_list.h" namespace gfx { @@ -185,4 +185,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_WM_SHELF_H_ +#endif // ASH_SHELF_WM_SHELF_H_
diff --git a/ash/common/shelf/wm_shelf_observer.h b/ash/shelf/wm_shelf_observer.h similarity index 84% rename from ash/common/shelf/wm_shelf_observer.h rename to ash/shelf/wm_shelf_observer.h index d137692..55033be 100644 --- a/ash/common/shelf/wm_shelf_observer.h +++ b/ash/shelf/wm_shelf_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_ -#define ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_ +#ifndef ASH_SHELF_WM_SHELF_OBSERVER_H_ +#define ASH_SHELF_WM_SHELF_OBSERVER_H_ #include "ash/ash_export.h" #include "ash/public/cpp/shelf_types.h" @@ -27,4 +27,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_ +#endif // ASH_SHELF_WM_SHELF_OBSERVER_H_
diff --git a/ash/common/shelf/wm_shelf_util.cc b/ash/shelf/wm_shelf_util.cc similarity index 88% rename from ash/common/shelf/wm_shelf_util.cc rename to ash/shelf/wm_shelf_util.cc index 05ba442..41934c5 100644 --- a/ash/common/shelf/wm_shelf_util.cc +++ b/ash/shelf/wm_shelf_util.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/wm_shelf_util.h" +#include "ash/shelf/wm_shelf_util.h" namespace ash {
diff --git a/ash/common/shelf/wm_shelf_util.h b/ash/shelf/wm_shelf_util.h similarity index 78% rename from ash/common/shelf/wm_shelf_util.h rename to ash/shelf/wm_shelf_util.h index 98bb1ad..5176ec9 100644 --- a/ash/common/shelf/wm_shelf_util.h +++ b/ash/shelf/wm_shelf_util.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_SHELF_WM_SHELF_UTIL_H_ -#define ASH_COMMON_SHELF_WM_SHELF_UTIL_H_ +#ifndef ASH_SHELF_WM_SHELF_UTIL_H_ +#define ASH_SHELF_WM_SHELF_UTIL_H_ #include "ash/ash_export.h" #include "ash/public/cpp/shelf_types.h" @@ -16,4 +16,4 @@ } // namespace ash -#endif // ASH_COMMON_SHELF_WM_SHELF_UTIL_H_ +#endif // ASH_SHELF_WM_SHELF_UTIL_H_
diff --git a/ash/shell.cc b/ash/shell.cc index 6849886..3a71803 100644 --- a/ash/shell.cc +++ b/ash/shell.cc
@@ -8,6 +8,7 @@ #include <string> #include <utility> +#include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_controller_delegate_aura.h" #include "ash/accelerators/accelerator_delegate.h" #include "ash/accelerators/magnifier_key_scroller.h" @@ -15,28 +16,13 @@ #include "ash/app_list/app_list_delegate_impl.h" #include "ash/aura/wm_shell_aura.h" #include "ash/autoclick/autoclick_controller.h" -#include "ash/common/accelerators/accelerator_controller.h" #include "ash/common/ash_constants.h" -#include "ash/common/frame/custom_frame_view_ash.h" #include "ash/common/gpu_support.h" #include "ash/common/keyboard/keyboard_ui.h" #include "ash/common/login_status.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/app_list_shelf_item_delegate.h" -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_delegate.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/root_window_finder.h" -#include "ash/common/wm/system_modal_container_layout_manager.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/cursor_window_controller.h" @@ -54,6 +40,7 @@ #include "ash/display/window_tree_host_manager.h" #include "ash/drag_drop/drag_drop_controller.h" #include "ash/first_run/first_run_helper_impl.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ash/high_contrast/high_contrast_controller.h" #include "ash/ime/input_method_event_handler.h" #include "ash/laser/laser_pointer_controller.h" @@ -61,6 +48,11 @@ #include "ash/magnifier/partial_magnification_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/app_list_shelf_item_delegate.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell_init_params.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/system/bluetooth/bluetooth_notification_controller.h" @@ -76,21 +68,29 @@ #include "ash/virtual_keyboard_controller.h" #include "ash/wm/ash_focus_rules.h" #include "ash/wm/ash_native_cursor_manager.h" +#include "ash/wm/container_finder.h" #include "ash/wm/event_client_impl.h" #include "ash/wm/immersive_handler_factory_ash.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" +#include "ash/wm/mru_window_tracker.h" #include "ash/wm/overlay_event_filter.h" #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/resize_shadow_controller.h" +#include "ash/wm/root_window_finder.h" #include "ash/wm/screen_pinning_controller.h" #include "ash/wm/system_gesture_event_filter.h" #include "ash/wm/system_modal_container_event_filter.h" +#include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/toplevel_window_event_handler.h" #include "ash/wm/video_detector.h" #include "ash/wm/window_animations.h" +#include "ash/wm/window_positioner.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" +#include "ash/wm/workspace_controller.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/ash/shell/context_menu.cc b/ash/shell/context_menu.cc index 5624b18..8282dac 100644 --- a/ash/shell/context_menu.cc +++ b/ash/shell/context_menu.cc
@@ -4,8 +4,8 @@ #include "ash/shell/context_menu.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" namespace ash {
diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h index 3db053c..6c25698c 100644 --- a/ash/shell/context_menu.h +++ b/ash/shell/context_menu.h
@@ -5,7 +5,7 @@ #ifndef ASH_SHELL_CONTEXT_MENU_H_ #define ASH_SHELL_CONTEXT_MENU_H_ -#include "ash/common/shelf/shelf_alignment_menu.h" +#include "ash/shelf/shelf_alignment_menu.h" #include "base/macros.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc index 5566a024..1dfedf9aa 100644 --- a/ash/shell/panel_window.cc +++ b/ash/shell/panel_window.cc
@@ -4,9 +4,9 @@ #include "ash/shell/panel_window.h" -#include "ash/common/wm/panels/panel_frame_view.h" #include "ash/public/cpp/window_properties.h" #include "ash/shell.h" +#include "ash/wm/panels/panel_frame_view.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" #include "ui/gfx/canvas.h"
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 45cac81..0f47f6a 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc
@@ -9,8 +9,6 @@ #include "ash/common/gpu_support_stub.h" #include "ash/common/palette_delegate.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/default_wallpaper_delegate.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" @@ -19,6 +17,8 @@ #include "ash/shell/toplevel_window.h" #include "ash/system/tray/default_system_tray_delegate.h" #include "ash/test/test_keyboard_ui.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/wm/window_state.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/shell/toplevel_window.cc b/ash/shell/toplevel_window.cc index 75faae1..b659f489 100644 --- a/ash/shell/toplevel_window.cc +++ b/ash/shell/toplevel_window.cc
@@ -4,9 +4,9 @@ #include "ash/shell/toplevel_window.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_state.h" #include "ash/shell.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h"
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 23cf1d3..a789dd6 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc
@@ -6,12 +6,12 @@ #include <utility> -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_widget.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/shell/window_watcher_shelf_item_delegate.h" #include "ash/wm/window_properties.h"
diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h index 757ea91..accd0ef 100644 --- a/ash/shell/window_watcher.h +++ b/ash/shell/window_watcher.h
@@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h"
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h index 73bb422..57f7aa10 100644 --- a/ash/shell/window_watcher_shelf_item_delegate.h +++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -5,8 +5,8 @@ #ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_types.h" #include "base/compiler_specific.h" #include "base/macros.h"
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 881b972..69877481 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc
@@ -8,9 +8,6 @@ #include <vector> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wallpaper/wallpaper_widget_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" @@ -18,6 +15,9 @@ #include "ash/drag_drop/drag_drop_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" #include "ash/wm/window_util.h"
diff --git a/ash/system/audio/tray_audio_unittest.cc b/ash/system/audio/tray_audio_unittest.cc index 094513c..16d7e89 100644 --- a/ash/system/audio/tray_audio_unittest.cc +++ b/ash/system/audio/tray_audio_unittest.cc
@@ -4,8 +4,8 @@ #include "ash/system/audio/tray_audio.h" -#include "ash/common/test/ash_test.h" #include "ash/system/tray/system_tray.h" +#include "ash/test/ash_test.h" namespace ash {
diff --git a/ash/system/audio/volume_view.cc b/ash/system/audio/volume_view.cc index dd5edb4..dd755925 100644 --- a/ash/system/audio/volume_view.cc +++ b/ash/system/audio/volume_view.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/audio/tray_audio_delegate.h"
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc index fb3db68..79ae2c4e 100644 --- a/ash/system/brightness/tray_brightness.cc +++ b/ash/system/brightness/tray_brightness.cc
@@ -8,7 +8,6 @@ #include "ash/common/material_design/material_design_controller.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -17,6 +16,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ash/system/brightness/tray_brightness_unittest.cc b/ash/system/brightness/tray_brightness_unittest.cc index 62e5a10..31e470f 100644 --- a/ash/system/brightness/tray_brightness_unittest.cc +++ b/ash/system/brightness/tray_brightness_unittest.cc
@@ -7,11 +7,11 @@ #include <memory> #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/test/ash_test.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_item.h" +#include "ash/test/ash_test.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ui/views/view.h" namespace ash {
diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc index 45e54f4..9765818 100644 --- a/ash/system/cast/tray_cast.cc +++ b/ash/system/cast/tray_cast.cc
@@ -12,12 +12,12 @@ #include "ash/common/cast_config_controller.h" #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/interfaces/cast_config.mojom.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/screen_security/screen_tray_item.h" #include "ash/system/tray/fixed_sized_image_view.h"
diff --git a/ash/system/date/date_default_view.cc b/ash/system/date/date_default_view.cc index 94a0dbe1..023ebba 100644 --- a/ash/system/date/date_default_view.cc +++ b/ash/system/date/date_default_view.cc
@@ -4,10 +4,10 @@ #include "ash/system/date/date_default_view.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/shutdown_controller.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/resources/grit/ash_resources.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/date/date_view_unittest.cc b/ash/system/date/date_view_unittest.cc index d84d2dc..7d5d510e 100644 --- a/ash/system/date/date_view_unittest.cc +++ b/ash/system/date/date_view_unittest.cc
@@ -4,7 +4,7 @@ #include "ash/system/date/date_view.h" -#include "ash/common/test/ash_test.h" +#include "ash/test/ash_test.h" #include "ui/views/controls/label.h" namespace ash {
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index f98fb3a..28847c1 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc
@@ -4,8 +4,8 @@ #include "ash/system/date/tray_date.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/date/date_default_view.h" #include "ash/system/date/date_view.h" #include "ash/system/system_clock_observer.h"
diff --git a/ash/system/date/tray_system_info.cc b/ash/system/date/tray_system_info.cc index eb2d701..4b04912 100644 --- a/ash/system/date/tray_system_info.cc +++ b/ash/system/date/tray_system_info.cc
@@ -4,8 +4,8 @@ #include "ash/system/date/tray_system_info.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/date/date_view.h" #include "ash/system/date/system_info_default_view.h" #include "ash/system/system_clock_observer.h"
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc index 543af4f1..700207fd 100644 --- a/ash/system/ime_menu/ime_menu_tray.cc +++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -8,13 +8,13 @@ #include "ash/common/ash_constants.h" #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/ime_menu/ime_list_view.h" #include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/ime_menu/ime_menu_tray_unittest.cc b/ash/system/ime_menu/ime_menu_tray_unittest.cc index d284a23..d001a85 100644 --- a/ash/system/ime_menu/ime_menu_tray_unittest.cc +++ b/ash/system/ime_menu/ime_menu_tray_unittest.cc
@@ -4,9 +4,8 @@ #include "ash/system/ime_menu/ime_menu_tray.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/accessibility_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" #include "ash/common/wm_shell.h" #include "ash/system/ime_menu/ime_list_view.h" #include "ash/system/status_area_widget.h" @@ -14,6 +13,7 @@ #include "ash/system/tray/system_tray_notifier.h" #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" +#include "ash/test/test_system_tray_delegate.h" #include "base/strings/utf_string_conversions.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc index a90d7087..e6417cb 100644 --- a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc +++ b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc
@@ -6,7 +6,6 @@ #include "ash/common/ash_view_ids.h" #include "ash/common/media_controller.h" -#include "ash/common/test/test_session_state_delegate.h" #include "ash/common/wm_shell.h" #include "ash/public/interfaces/media.mojom.h" #include "ash/system/status_area_widget.h" @@ -16,6 +15,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "ash/test/status_area_widget_test_helper.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" #include "ui/views/bubble/tray_bubble_view.h"
diff --git a/ash/system/network/sms_observer_unittest.cc b/ash/system/network/sms_observer_unittest.cc index aa4e999..a22172d 100644 --- a/ash/system/network/sms_observer_unittest.cc +++ b/ash/system/network/sms_observer_unittest.cc
@@ -4,9 +4,9 @@ #include "ash/system/network/sms_observer.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/public/interfaces/vpn_list.mojom.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/macros.h"
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc index 7b0fcc8..e04d0590 100644 --- a/ash/system/network/tray_network.cc +++ b/ash/system/network/tray_network.cc
@@ -4,9 +4,9 @@ #include "ash/system/network/tray_network.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/network/network_icon.h" #include "ash/system/network/network_icon_animation.h"
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc index 3e5f796..91ef413 100644 --- a/ash/system/overview/overview_button_tray.cc +++ b/ash/system/overview/overview_button_tray.cc
@@ -5,14 +5,14 @@ #include "ash/system/overview/overview_button_tray.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/shelf_constants.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/overview/window_selector_controller.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/border.h"
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc index 346a6aa..4783129 100644 --- a/ash/system/overview/overview_button_tray_unittest.cc +++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -5,9 +5,6 @@ #include "ash/system/overview/overview_button_tray.h" #include "ash/common/login_status.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" @@ -16,6 +13,9 @@ #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" #include "ash/test/status_area_widget_test_helper.h" +#include "ash/test/test_session_state_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/overview/window_selector_controller.h" #include "base/command_line.h" #include "base/test/user_action_tester.h" #include "base/time/time.h"
diff --git a/ash/system/palette/common_palette_tool.cc b/ash/system/palette/common_palette_tool.cc index d9e5634..6495006 100644 --- a/ash/system/palette/common_palette_tool.cc +++ b/ash/system/palette/common_palette_tool.cc
@@ -4,8 +4,8 @@ #include "ash/system/palette/common_palette_tool.h" -#include "ash/common/shelf/shelf_constants.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/shelf/shelf_constants.h" #include "ash/system/palette/palette_ids.h" #include "ash/system/palette/palette_tool_manager.h" #include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc index d78fa6e..2d176f6 100644 --- a/ash/system/palette/palette_tray.cc +++ b/ash/system/palette/palette_tray.cc
@@ -6,15 +6,15 @@ #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/palette/palette_tool_manager.h" #include "ash/system/palette/palette_utils.h"
diff --git a/ash/system/palette/palette_utils.cc b/ash/system/palette/palette_utils.cc index b24658e..20320fa1 100644 --- a/ash/system/palette/palette_utils.cc +++ b/ash/system/palette/palette_utils.cc
@@ -5,9 +5,9 @@ #include "ash/system/palette/palette_utils.h" #include "ash/common/ash_switches.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/palette/palette_tray.h" #include "ash/system/status_area_widget.h" #include "base/command_line.h"
diff --git a/ash/system/palette/tools/capture_region_mode.cc b/ash/system/palette/tools/capture_region_mode.cc index 3e0463c..d0b6ac3 100644 --- a/ash/system/palette/tools/capture_region_mode.cc +++ b/ash/system/palette/tools/capture_region_mode.cc
@@ -4,7 +4,7 @@ #include "ash/system/palette/tools/capture_region_mode.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/palette_delegate.h" #include "ash/common/wm_shell.h" #include "ash/resources/vector_icons/vector_icons.h"
diff --git a/ash/system/palette/tools/create_note_unittest.cc b/ash/system/palette/tools/create_note_unittest.cc index f44930c1..a3f04dd 100644 --- a/ash/system/palette/tools/create_note_unittest.cc +++ b/ash/system/palette/tools/create_note_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_palette_delegate.h" #include "ash/common/wm_shell.h" #include "ash/system/palette/mock_palette_tool_delegate.h" #include "ash/system/palette/palette_ids.h" #include "ash/system/palette/palette_tool.h" #include "ash/system/palette/tools/create_note_action.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_palette_delegate.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "ui/views/view.h"
diff --git a/ash/system/palette/tools/screenshot_unittest.cc b/ash/system/palette/tools/screenshot_unittest.cc index 8283313..1b30fe2 100644 --- a/ash/system/palette/tools/screenshot_unittest.cc +++ b/ash/system/palette/tools/screenshot_unittest.cc
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_palette_delegate.h" #include "ash/common/wm_shell.h" #include "ash/system/palette/mock_palette_tool_delegate.h" #include "ash/system/palette/palette_ids.h" @@ -10,6 +9,7 @@ #include "ash/system/palette/tools/capture_region_mode.h" #include "ash/system/palette/tools/capture_screen_action.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_palette_delegate.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/ash/system/power/power_event_observer_unittest.cc b/ash/system/power/power_event_observer_unittest.cc index 2e0e54c..d6325bb 100644 --- a/ash/system/power/power_event_observer_unittest.cc +++ b/ash/system/power/power_event_observer_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "ash/common/test/test_session_state_delegate.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_session_state_delegate.h" #include "base/time/time.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/ash/system/power/tablet_power_button_controller.cc b/ash/system/power/tablet_power_button_controller.cc index c1d76e139..3a06df60 100644 --- a/ash/system/power/tablet_power_button_controller.cc +++ b/ash/system/power/tablet_power_button_controller.cc
@@ -7,10 +7,10 @@ #include "ash/common/accessibility_delegate.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/shell_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/time/default_tick_clock.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/events/devices/input_device_manager.h"
diff --git a/ash/system/power/tablet_power_button_controller_unittest.cc b/ash/system/power/tablet_power_button_controller_unittest.cc index abd0a50..e9a1373 100644 --- a/ash/system/power/tablet_power_button_controller_unittest.cc +++ b/ash/system/power/tablet_power_button_controller_unittest.cc
@@ -8,13 +8,13 @@ #include "ash/common/ash_switches.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/lock_state_controller_test_api.h" #include "ash/test/test_shell_delegate.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/power_button_controller.h" #include "base/command_line.h" #include "base/compiler_specific.h"
diff --git a/ash/system/rotation/tray_rotation_lock.cc b/ash/system/rotation/tray_rotation_lock.cc index de0d449..502b5b4 100644 --- a/ash/system/rotation/tray_rotation_lock.cc +++ b/ash/system/rotation/tray_rotation_lock.cc
@@ -4,7 +4,6 @@ #include "ash/system/rotation/tray_rotation_lock.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -16,6 +15,7 @@ #include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/tray/tri_view.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/display/display.h"
diff --git a/ash/system/rotation/tray_rotation_lock_unittest.cc b/ash/system/rotation/tray_rotation_lock_unittest.cc index b12cfa0..82e15aa 100644 --- a/ash/system/rotation/tray_rotation_lock_unittest.cc +++ b/ash/system/rotation/tray_rotation_lock_unittest.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/root_window_controller.h" @@ -16,6 +15,7 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" #include "base/time/time.h" #include "ui/display/display_switches.h"
diff --git a/ash/system/screen_layout_observer.cc b/ash/system/screen_layout_observer.cc index cd1fc707..672a990 100644 --- a/ash/system/screen_layout_observer.cc +++ b/ash/system/screen_layout_observer.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/resources/grit/ash_resources.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/screen_layout_observer_unittest.cc b/ash/system/screen_layout_observer_unittest.cc index 726b692..a3c98f7 100644 --- a/ash/system/screen_layout_observer_unittest.cc +++ b/ash/system/screen_layout_observer_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/system/screen_layout_observer.h" -#include "ash/common/test/test_system_tray_delegate.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/devicetype_utils.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_system_tray_delegate.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/screen_security/screen_capture_tray_item.cc b/ash/system/screen_security/screen_capture_tray_item.cc index e6c4fe7..8628676 100644 --- a/ash/system/screen_security/screen_capture_tray_item.cc +++ b/ash/system/screen_security/screen_capture_tray_item.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/resources/grit/ash_resources.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/system_notifier.h"
diff --git a/ash/system/screen_security/screen_tray_item.cc b/ash/system/screen_security/screen_tray_item.cc index f0f8d4f..9fe53499 100644 --- a/ash/system/screen_security/screen_tray_item.cc +++ b/ash/system/screen_security/screen_tray_item.cc
@@ -5,9 +5,9 @@ #include "ash/system/screen_security/screen_tray_item.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_item_style.h"
diff --git a/ash/system/screen_security/screen_tray_item_unittest.cc b/ash/system/screen_security/screen_tray_item_unittest.cc index d68c039..4aa4ff17 100644 --- a/ash/system/screen_security/screen_tray_item_unittest.cc +++ b/ash/system/screen_security/screen_tray_item_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/system/screen_security/screen_tray_item.h" -#include "ash/common/test/ash_test.h" #include "ash/common/wm_shell.h" #include "ash/system/screen_security/screen_capture_tray_item.h" #include "ash/system/screen_security/screen_share_tray_item.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_item_view.h" +#include "ash/test/ash_test.h" #include "base/callback.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/session/logout_button_tray.cc b/ash/system/session/logout_button_tray.cc index 63fa7b8..ee69fc4 100644 --- a/ash/system/session/logout_button_tray.cc +++ b/ash/system/session/logout_button_tray.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shelf_types.h" #include "ash/resources/grit/ash_resources.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/session/logout_confirmation_controller.h" #include "ash/system/tray/system_tray_controller.h" #include "ash/system/tray/system_tray_notifier.h"
diff --git a/ash/system/session/tray_session_length_limit_unittest.cc b/ash/system/session/tray_session_length_limit_unittest.cc index 837ae20..19df0cc 100644 --- a/ash/system/session/tray_session_length_limit_unittest.cc +++ b/ash/system/session/tray_session_length_limit_unittest.cc
@@ -4,9 +4,9 @@ #include "ash/system/session/tray_session_length_limit.h" -#include "ash/common/test/test_system_tray_delegate.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_system_tray_delegate.h" #include "base/memory/ptr_util.h" #include "base/time/time.h" #include "ui/message_center/message_center.h"
diff --git a/ash/system/status_area_layout_manager.cc b/ash/system/status_area_layout_manager.cc index ac9a6ea4..ec65ee2 100644 --- a/ash/system/status_area_layout_manager.cc +++ b/ash/system/status_area_layout_manager.cc
@@ -4,9 +4,9 @@ #include "ash/system/status_area_layout_manager.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_widget.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" #include "ash/system/status_area_widget.h" #include "base/auto_reset.h"
diff --git a/ash/system/status_area_layout_manager.h b/ash/system/status_area_layout_manager.h index fb204b2..2d1fecb 100644 --- a/ash/system/status_area_layout_manager.h +++ b/ash/system/status_area_layout_manager.h
@@ -5,7 +5,7 @@ #ifndef ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_ #define ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_ -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/wm/wm_snap_to_pixel_layout_manager.h" #include "base/macros.h" namespace ash {
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index f9a87e44..dd27eae 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc
@@ -5,11 +5,11 @@ #include "ash/system/status_area_widget.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/ime_menu/ime_menu_tray.h" #include "ash/system/overview/overview_button_tray.h" #include "ash/system/palette/palette_tray.h"
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h index 33cf3509..dcdb5bf 100644 --- a/ash/system/status_area_widget.h +++ b/ash/system/status_area_widget.h
@@ -7,8 +7,8 @@ #include "ash/ash_export.h" #include "ash/common/login_status.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_background_animator_observer.h" #include "base/macros.h" #include "ui/views/widget/widget.h"
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc index 8a2746e..21c942e 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc
@@ -5,12 +5,12 @@ #include "ash/system/status_area_widget_delegate.h" #include "ash/common/focus_cycler.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/tray_constants.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/system/supervised/tray_supervised_user_unittest.cc b/ash/system/supervised/tray_supervised_user_unittest.cc index c9a0120..2b666d3 100644 --- a/ash/system/supervised/tray_supervised_user_unittest.cc +++ b/ash/system/supervised/tray_supervised_user_unittest.cc
@@ -5,8 +5,8 @@ #include "ash/system/supervised/tray_supervised_user.h" #include "ash/common/login_status.h" -#include "ash/common/test/ash_test.h" -#include "ash/common/test/test_system_tray_delegate.h" +#include "ash/test/ash_test.h" +#include "ash/test/test_system_tray_delegate.h" #include "ui/message_center/message_center.h" #include "ui/message_center/notification.h" #include "ui/message_center/notification_list.h"
diff --git a/ash/system/tiles/tiles_default_view.cc b/ash/system/tiles/tiles_default_view.cc index ce8b24d..d12e5ccf 100644 --- a/ash/system/tiles/tiles_default_view.cc +++ b/ash/system/tiles/tiles_default_view.cc
@@ -4,10 +4,10 @@ #include "ash/system/tiles/tiles_default_view.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/shutdown_controller.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/tiles/tray_tiles.cc b/ash/system/tiles/tray_tiles.cc index a0d5e56..ea1b5cc 100644 --- a/ash/system/tiles/tray_tiles.cc +++ b/ash/system/tiles/tray_tiles.cc
@@ -4,9 +4,9 @@ #include "ash/system/tiles/tray_tiles.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/session/session_state_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/system/tiles/tiles_default_view.h" namespace ash {
diff --git a/ash/system/toast/toast_manager_unittest.cc b/ash/system/toast/toast_manager_unittest.cc index df227e4..1518d86 100644 --- a/ash/system/toast/toast_manager_unittest.cc +++ b/ash/system/toast/toast_manager_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/toast/toast_manager.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/wm_screen_util.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h"
diff --git a/ash/system/toast/toast_overlay.cc b/ash/system/toast/toast_overlay.cc index 8175419..ab1885ae 100644 --- a/ash/system/toast/toast_overlay.cc +++ b/ash/system/toast/toast_overlay.cc
@@ -4,11 +4,11 @@ #include "ash/system/toast/toast_overlay.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index fd6d106..3bad616 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc
@@ -12,14 +12,13 @@ #include "ash/common/login_status.h" #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" -#include "ash/common/wm/container_finder.h" #include "ash/common/wm_activation_observer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/audio/tray_audio.h" #include "ash/system/bluetooth/tray_bluetooth.h" @@ -51,6 +50,7 @@ #include "ash/system/update/tray_update.h" #include "ash/system/user/tray_user.h" #include "ash/system/web_notification/web_notification_tray.h" +#include "ash/wm/container_finder.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 76625247..62c8d95 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc
@@ -7,13 +7,13 @@ #include <string> #include <vector> -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/accessibility_delegate.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_bubble.h" #include "ash/system/tray/system_tray_item.h"
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 9c857b21..326c4a2 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc
@@ -8,13 +8,13 @@ #include "ash/common/ash_constants.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_event_filter.h"
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h index a35f828..1e5280d 100644 --- a/ash/system/tray/tray_background_view.h +++ b/ash/system/tray/tray_background_view.h
@@ -8,8 +8,8 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_background_animator_observer.h" #include "ash/system/tray/actionable_view.h" #include "base/macros.h" #include "ui/compositor/layer_animation_observer.h"
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc index f8e4ef0..3d6d7a1 100644 --- a/ash/system/tray/tray_event_filter.cc +++ b/ash/system/tray/tray_event_filter.cc
@@ -4,12 +4,12 @@ #include "ash/system/tray/tray_event_filter.h" -#include "ash/common/wm/container_finder.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/system/tray/tray_background_view.h" #include "ash/system/tray/tray_bubble_wrapper.h" +#include "ash/wm/container_finder.h" #include "ui/views/widget/widget.h" namespace ash {
diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc index 237d5b4..0633b0cb 100644 --- a/ash/system/tray/tray_image_item.cc +++ b/ash/system/tray/tray_image_item.cc
@@ -4,8 +4,8 @@ #include "ash/system/tray/tray_image_item.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_view.h"
diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc index fee77345..32597ce 100644 --- a/ash/system/tray/tray_item_view.cc +++ b/ash/system/tray/tray_item_view.cc
@@ -5,8 +5,8 @@ #include "ash/system/tray/tray_item_view.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h"
diff --git a/ash/system/tray/tray_utils.cc b/ash/system/tray/tray_utils.cc index f1b8fe2..5a42c80 100644 --- a/ash/system/tray/tray_utils.cc +++ b/ash/system/tray/tray_utils.cc
@@ -5,7 +5,7 @@ #include "ash/system/tray/tray_utils.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/shelf/wm_shelf_util.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_view.h" #include "ui/accessibility/ax_node_data.h"
diff --git a/ash/system/tray_tracing.cc b/ash/system/tray_tracing.cc index e2c14a9..1f787ea8 100644 --- a/ash/system/tray_tracing.cc +++ b/ash/system/tray_tracing.cc
@@ -4,8 +4,8 @@ #include "ash/system/tray_tracing.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/actionable_view.h"
diff --git a/ash/system/update/tray_update.cc b/ash/system/update/tray_update.cc index 5eb2c05..ccbb434 100644 --- a/ash/system/update/tray_update.cc +++ b/ash/system/update/tray_update.cc
@@ -4,8 +4,8 @@ #include "ash/system/update/tray_update.h" -#include "ash/common/metrics/user_metrics_action.h" #include "ash/common/wm_shell.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/public/interfaces/update.mojom.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/update/tray_update_unittest.cc b/ash/system/update/tray_update_unittest.cc index d058a6f..c33947f 100644 --- a/ash/system/update/tray_update_unittest.cc +++ b/ash/system/update/tray_update_unittest.cc
@@ -4,11 +4,11 @@ #include "ash/system/update/tray_update.h" -#include "ash/common/test/ash_test.h" #include "ash/common/wm_shell.h" #include "ash/public/interfaces/update.mojom.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_controller.h" +#include "ash/test/ash_test.h" namespace ash {
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 4ed4d38..0dfa5233 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc
@@ -5,8 +5,8 @@ #include "ash/system/user/tray_user.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h"
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc index 1a9da2b..cb3bceb 100644 --- a/ash/system/user/tray_user_unittest.cc +++ b/ash/system/user/tray_user_unittest.cc
@@ -5,7 +5,6 @@ #include <vector> #include "ash/common/shell_delegate.h" -#include "ash/common/test/test_session_state_delegate.h" #include "ash/common/wm_shell.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" @@ -13,6 +12,7 @@ #include "ash/system/user/user_view.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc index 53ebc901..19e60ec 100644 --- a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
@@ -7,11 +7,11 @@ #include <algorithm> #include "ash/common/keyboard/keyboard_ui.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/resources/vector_icons/vector_icons.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/tray_constants.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.cc b/ash/system/web_notification/ash_popup_alignment_delegate.cc index a196443..0d33b7bc 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate.cc +++ b/ash/system/web_notification/ash_popup_alignment_delegate.cc
@@ -4,13 +4,13 @@ #include "ash/system/web_notification/ash_popup_alignment_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "base/i18n/rtl.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h index c631565..d8e41b4 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate.h +++ b/ash/system/web_notification/ash_popup_alignment_delegate.h
@@ -8,9 +8,9 @@ #include <stdint.h> #include "ash/ash_export.h" -#include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/shell_observer.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/wm_shelf_observer.h" #include "base/macros.h" #include "ui/display/display_observer.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc index 271cfb3..56ff6e9 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc +++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -7,12 +7,12 @@ #include <utility> #include <vector> -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/command_line.h"
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index cd06e236..8e6c79df 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc
@@ -6,14 +6,14 @@ #include "ash/common/material_design/material_design_controller.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray.h"
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index c7fdf33..4a00585 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -7,13 +7,11 @@ #include <utility> #include <vector> -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_system_tray_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/screen_layout_observer.h" #include "ash/system/status_area_widget.h" @@ -22,6 +20,8 @@ #include "ash/system/web_notification/ash_popup_alignment_delegate.h" #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" +#include "ash/test/test_system_tray_delegate.h" +#include "ash/wm/window_state.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/test/BUILD.gn b/ash/test/BUILD.gn index 96d7d5d..02c7e16 100644 --- a/ash/test/BUILD.gn +++ b/ash/test/BUILD.gn
@@ -67,23 +67,23 @@ testonly = true visibility = [ ":*" ] sources = [ - "../common/test/ash_test.cc", - "../common/test/ash_test.h", - "../common/test/ash_test_impl.h", - "../common/test/test_palette_delegate.cc", - "../common/test/test_palette_delegate.h", - "../common/test/test_session_state_delegate.cc", - "../common/test/test_session_state_delegate.h", - "../common/test/test_shelf_delegate.cc", - "../common/test/test_shelf_delegate.h", - "../common/test/test_shelf_item_delegate.cc", - "../common/test/test_shelf_item_delegate.h", - "../common/test/test_system_tray_delegate.cc", - "../common/test/test_system_tray_delegate.h", - "../common/test/wm_shell_test_api.cc", - "../common/test/wm_shell_test_api.h", - "../common/test/workspace_event_handler_test_helper.cc", - "../common/test/workspace_event_handler_test_helper.h", + "ash_test.cc", + "ash_test.h", + "ash_test_impl.h", + "test_palette_delegate.cc", + "test_palette_delegate.h", + "test_session_state_delegate.cc", + "test_session_state_delegate.h", + "test_shelf_delegate.cc", + "test_shelf_delegate.h", + "test_shelf_item_delegate.cc", + "test_shelf_item_delegate.h", + "test_system_tray_delegate.cc", + "test_system_tray_delegate.h", + "wm_shell_test_api.cc", + "wm_shell_test_api.h", + "workspace_event_handler_test_helper.cc", + "workspace_event_handler_test_helper.h", # TODO(jamescook): Move these files into ash/test. "../laser/laser_pointer_controller_test_api.cc",
diff --git a/ash/common/test/ash_test.cc b/ash/test/ash_test.cc similarity index 94% rename from ash/common/test/ash_test.cc rename to ash/test/ash_test.cc index 126e236..f3d7072 100644 --- a/ash/common/test/ash_test.cc +++ b/ash/test/ash_test.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/ash_test.h" +#include "ash/test/ash_test.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/ash_test_impl.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/system/status_area_widget.h" +#include "ash/test/ash_test_impl.h" +#include "ash/test/test_session_state_delegate.h" +#include "ash/test/test_system_tray_delegate.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "ui/compositor/layer_type.h"
diff --git a/ash/common/test/ash_test.h b/ash/test/ash_test.h similarity index 97% rename from ash/common/test/ash_test.h rename to ash/test/ash_test.h index d91c4d6..0eccb70d 100644 --- a/ash/common/test/ash_test.h +++ b/ash/test/ash_test.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_ASH_TEST_H_ -#define ASH_COMMON_TEST_ASH_TEST_H_ +#ifndef ASH_TEST_ASH_TEST_H_ +#define ASH_TEST_ASH_TEST_H_ #include <memory> #include <string> @@ -146,4 +146,4 @@ } // namespace ash -#endif // ASH_COMMON_TEST_ASH_TEST_H_ +#endif // ASH_TEST_ASH_TEST_H_
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 3da727a..32fc673 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc
@@ -7,9 +7,6 @@ #include <string> #include <vector> -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" -#include "ash/common/wm/window_positioner.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/extended_mouse_warp_controller.h" @@ -22,7 +19,10 @@ #include "ash/shell/toplevel_window.h" #include "ash/test/ash_test_environment.h" #include "ash/test/ash_test_helper.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/test/test_system_tray_delegate.h" +#include "ash/wm/window_positioner.h" #include "base/command_line.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 910c4e1..1ed61fa 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc
@@ -5,9 +5,6 @@ #include "ash/test/ash_test_helper.h" #include "ash/accelerators/accelerator_controller_delegate_aura.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" -#include "ash/common/test/wm_shell_test_api.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/mus/screen_mus.h" @@ -20,7 +17,10 @@ #include "ash/test/ash_test_views_delegate.h" #include "ash/test/shell_test_api.h" #include "ash/test/test_screenshot_delegate.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/test/test_system_tray_delegate.h" +#include "ash/test/wm_shell_test_api.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/ash/common/test/ash_test_impl.h b/ash/test/ash_test_impl.h similarity index 92% rename from ash/common/test/ash_test_impl.h rename to ash/test/ash_test_impl.h index 8984dfbf..f1ba7f7 100644 --- a/ash/common/test/ash_test_impl.h +++ b/ash/test/ash_test_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_ASH_TEST_IMPL_H_ -#define ASH_COMMON_TEST_ASH_TEST_IMPL_H_ +#ifndef ASH_TEST_ASH_TEST_IMPL_H_ +#define ASH_TEST_ASH_TEST_IMPL_H_ #include <memory> #include <string> @@ -57,4 +57,4 @@ } // namespace ash -#endif // ASH_COMMON_TEST_ASH_TEST_IMPL_H_ +#endif // ASH_TEST_ASH_TEST_IMPL_H_
diff --git a/ash/test/ash_test_impl_aura.cc b/ash/test/ash_test_impl_aura.cc index ec4fa78..4508c531 100644 --- a/ash/test/ash_test_impl_aura.cc +++ b/ash/test/ash_test_impl_aura.cc
@@ -4,10 +4,10 @@ #include "ash/test/ash_test_impl_aura.h" -#include "ash/common/test/ash_test.h" #include "ash/common/wm_window.h" #include "ash/screen_util.h" #include "ash/shell.h" +#include "ash/test/ash_test.h" #include "ash/test/ash_test_base.h" #include "base/memory/ptr_util.h" #include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/test/ash_test_impl_aura.h b/ash/test/ash_test_impl_aura.h index 54a9c99..c723749 100644 --- a/ash/test/ash_test_impl_aura.h +++ b/ash/test/ash_test_impl_aura.h
@@ -5,7 +5,7 @@ #ifndef ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ #define ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ -#include "ash/common/test/ash_test_impl.h" +#include "ash/test/ash_test_impl.h" namespace ash { namespace test {
diff --git a/ash/test/overflow_bubble_view_test_api.cc b/ash/test/overflow_bubble_view_test_api.cc index cabf43a3..aa61675 100644 --- a/ash/test/overflow_bubble_view_test_api.cc +++ b/ash/test/overflow_bubble_view_test_api.cc
@@ -4,7 +4,7 @@ #include "ash/test/overflow_bubble_view_test_api.h" -#include "ash/common/shelf/overflow_bubble_view.h" +#include "ash/shelf/overflow_bubble_view.h" namespace ash { namespace test {
diff --git a/ash/test/shelf_button_pressed_metric_tracker_test_api.h b/ash/test/shelf_button_pressed_metric_tracker_test_api.h index 24ac55bb..874365b 100644 --- a/ash/test/shelf_button_pressed_metric_tracker_test_api.h +++ b/ash/test/shelf_button_pressed_metric_tracker_test_api.h
@@ -5,7 +5,7 @@ #ifndef ASH_TEST_SHELF_BUTTON_PRESSED_METRIC_TRACKER_TEST_API_H_ #define ASH_TEST_SHELF_BUTTON_PRESSED_METRIC_TRACKER_TEST_API_H_ -#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h" +#include "ash/shelf/shelf_button_pressed_metric_tracker.h" #include <memory>
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc index 6231c154..9bf2d8c7 100644 --- a/ash/test/shelf_view_test_api.cc +++ b/ash/test/shelf_view_test_api.cc
@@ -4,11 +4,11 @@ #include "ash/test/shelf_view_test_api.h" -#include "ash/common/shelf/overflow_button.h" -#include "ash/common/shelf/shelf_button.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_view.h" +#include "ash/shelf/overflow_button.h" +#include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_view.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "ui/views/animation/bounds_animator.h"
diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h index be7185b57..5fd84b9 100644 --- a/ash/test/shelf_view_test_api.h +++ b/ash/test/shelf_view_test_api.h
@@ -5,7 +5,7 @@ #ifndef ASH_TEST_SHELF_VIEW_TEST_API_H_ #define ASH_TEST_SHELF_VIEW_TEST_API_H_ -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" #include "base/macros.h" namespace gfx {
diff --git a/ash/common/test/test_palette_delegate.cc b/ash/test/test_palette_delegate.cc similarity index 95% rename from ash/common/test/test_palette_delegate.cc rename to ash/test/test_palette_delegate.cc index ab5692f..49881d3 100644 --- a/ash/common/test/test_palette_delegate.cc +++ b/ash/test/test_palette_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_palette_delegate.h" +#include "ash/test/test_palette_delegate.h" namespace ash {
diff --git a/ash/common/test/test_palette_delegate.h b/ash/test/test_palette_delegate.h similarity index 92% rename from ash/common/test/test_palette_delegate.h rename to ash/test/test_palette_delegate.h index f0fc5e55..e70e09d 100644 --- a/ash/common/test/test_palette_delegate.h +++ b/ash/test/test_palette_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_TEST_PALETTE_DELEGATE_H_ -#define ASH_COMMON_TEST_TEST_PALETTE_DELEGATE_H_ +#ifndef ASH_TEST_TEST_PALETTE_DELEGATE_H_ +#define ASH_TEST_TEST_PALETTE_DELEGATE_H_ #include "ash/common/palette_delegate.h" #include "base/macros.h" @@ -66,4 +66,4 @@ } // namespace ash -#endif // ASH_COMMON_TEST_TEST_PALETTE_DELEGATE_H_ +#endif // ASH_TEST_TEST_PALETTE_DELEGATE_H_
diff --git a/ash/common/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc similarity index 98% rename from ash/common/test/test_session_state_delegate.cc rename to ash/test/test_session_state_delegate.cc index 265c048..00834bd 100644 --- a/ash/common/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_session_state_delegate.h" +#include "ash/test/test_session_state_delegate.h" #include <algorithm> #include <string>
diff --git a/ash/common/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h similarity index 95% rename from ash/common/test/test_session_state_delegate.h rename to ash/test/test_session_state_delegate.h index eb71d540..35fe677 100644 --- a/ash/common/test/test_session_state_delegate.h +++ b/ash/test/test_session_state_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_ -#define ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_ +#ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ +#define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ #include <memory> #include <vector> @@ -119,4 +119,4 @@ } // namespace test } // namespace ash -#endif // ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_ +#endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
diff --git a/ash/common/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc similarity index 96% rename from ash/common/test/test_shelf_delegate.cc rename to ash/test/test_shelf_delegate.cc index ee762fd..1fbdd16e 100644 --- a/ash/common/test/test_shelf_delegate.cc +++ b/ash/test/test_shelf_delegate.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_shelf_delegate.h" +#include "ash/test/test_shelf_delegate.h" #include <utility> -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_observer.h" -#include "ash/common/test/test_shelf_item_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/test/test_shelf_item_delegate.h" #include "ash/wm/window_properties.h" #include "base/memory/ptr_util.h" #include "ui/aura/window.h"
diff --git a/ash/common/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h similarity index 93% rename from ash/common/test/test_shelf_delegate.h rename to ash/test/test_shelf_delegate.h index a334848..d9e14ca 100644 --- a/ash/common/test/test_shelf_delegate.h +++ b/ash/test/test_shelf_delegate.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ -#define ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ +#ifndef ASH_TEST_TEST_SHELF_DELEGATE_H_ +#define ASH_TEST_TEST_SHELF_DELEGATE_H_ #include <map> #include <set> #include <string> -#include "ash/common/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_delegate.h" #include "base/macros.h" #include "ui/aura/window_observer.h" @@ -83,4 +83,4 @@ } // namespace test } // namespace ash -#endif // ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_ +#endif // ASH_TEST_TEST_SHELF_DELEGATE_H_
diff --git a/ash/common/test/test_shelf_item_delegate.cc b/ash/test/test_shelf_item_delegate.cc similarity index 96% rename from ash/common/test/test_shelf_item_delegate.cc rename to ash/test/test_shelf_item_delegate.cc index 31e22c8..d70d384 100644 --- a/ash/common/test/test_shelf_item_delegate.cc +++ b/ash/test/test_shelf_item_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_shelf_item_delegate.h" +#include "ash/test/test_shelf_item_delegate.h" #include "ash/common/wm_window.h" #include "ash/wm/window_util.h"
diff --git a/ash/common/test/test_shelf_item_delegate.h b/ash/test/test_shelf_item_delegate.h similarity index 82% rename from ash/common/test/test_shelf_item_delegate.h rename to ash/test/test_shelf_item_delegate.h index 6e2f8b5..24360e4 100644 --- a/ash/common/test/test_shelf_item_delegate.h +++ b/ash/test/test_shelf_item_delegate.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_TEST_SHELF_ITEM_DELEGATE_H_ -#define ASH_COMMON_TEST_TEST_SHELF_ITEM_DELEGATE_H_ +#ifndef ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_ +#define ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_ -#include "ash/common/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_delegate.h" #include "base/macros.h" namespace ash { @@ -38,4 +38,4 @@ } // namespace test } // namespace ash -#endif // ASH_COMMON_TEST_TEST_SHELF_ITEM_DELEGATE_H_ +#endif // ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 37f8536..d1e753f 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc
@@ -10,15 +10,15 @@ #include "ash/common/gpu_support_stub.h" #include "ash/common/palette_delegate.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/test/test_system_tray_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/test/test_keyboard_ui.h" +#include "ash/test/test_session_state_delegate.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/test/test_system_tray_delegate.h" #include "ash/test/test_wallpaper_delegate.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index fe30c3c..5d8bea3 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h
@@ -9,7 +9,7 @@ #include <string> #include "ash/common/shell_delegate.h" -#include "ash/common/test/test_session_state_delegate.h" +#include "ash/test/test_session_state_delegate.h" #include "base/macros.h" namespace keyboard {
diff --git a/ash/common/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc similarity index 97% rename from ash/common/test/test_system_tray_delegate.cc rename to ash/test/test_system_tray_delegate.cc index 84b240c33..524058b0e 100644 --- a/ash/common/test/test_system_tray_delegate.cc +++ b/ash/test/test_system_tray_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/test_system_tray_delegate.h" +#include "ash/test/test_system_tray_delegate.h" #include <string>
diff --git a/ash/common/test/test_system_tray_delegate.h b/ash/test/test_system_tray_delegate.h similarity index 93% rename from ash/common/test/test_system_tray_delegate.h rename to ash/test/test_system_tray_delegate.h index b8ed42f..8dc944f 100644 --- a/ash/common/test/test_system_tray_delegate.h +++ b/ash/test/test_system_tray_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ -#define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ +#ifndef ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ +#define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ #include "ash/system/tray/default_system_tray_delegate.h" #include "ash/system/tray/ime_info.h" @@ -73,4 +73,4 @@ } // namespace test } // namespace ash -#endif // ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ +#endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index d0606357..090059ec 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/shell.h" +#include "ash/wm/root_window_finder.h" #include "ash/wm/window_properties.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/screen_position_client.h"
diff --git a/ash/common/test/wm_shell_test_api.cc b/ash/test/wm_shell_test_api.cc similarity index 92% rename from ash/common/test/wm_shell_test_api.cc rename to ash/test/wm_shell_test_api.cc index e48b444..35f4b1e 100644 --- a/ash/common/test/wm_shell_test_api.cc +++ b/ash/test/wm_shell_test_api.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/wm_shell_test_api.h" +#include "ash/test/wm_shell_test_api.h" #include <utility>
diff --git a/ash/common/test/wm_shell_test_api.h b/ash/test/wm_shell_test_api.h similarity index 79% rename from ash/common/test/wm_shell_test_api.h rename to ash/test/wm_shell_test_api.h index 07ab6fff..d4be5cf 100644 --- a/ash/common/test/wm_shell_test_api.h +++ b/ash/test/wm_shell_test_api.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_WM_SHELL_TEST_API_H_ -#define ASH_COMMON_TEST_WM_SHELL_TEST_API_H_ +#ifndef ASH_TEST_WM_SHELL_TEST_API_H_ +#define ASH_TEST_WM_SHELL_TEST_API_H_ #include <memory> @@ -27,4 +27,4 @@ } // namespace ash -#endif // ASH_COMMON_TEST_WM_SHELL_TEST_API_H_ +#endif // ASH_TEST_WM_SHELL_TEST_API_H_
diff --git a/ash/common/test/workspace_event_handler_test_helper.cc b/ash/test/workspace_event_handler_test_helper.cc similarity index 86% rename from ash/common/test/workspace_event_handler_test_helper.cc rename to ash/test/workspace_event_handler_test_helper.cc index 865ffbf..fe7b1d9 100644 --- a/ash/common/test/workspace_event_handler_test_helper.cc +++ b/ash/test/workspace_event_handler_test_helper.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/test/workspace_event_handler_test_helper.h" +#include "ash/test/workspace_event_handler_test_helper.h" namespace ash {
diff --git a/ash/common/test/workspace_event_handler_test_helper.h b/ash/test/workspace_event_handler_test_helper.h similarity index 71% rename from ash/common/test/workspace_event_handler_test_helper.h rename to ash/test/workspace_event_handler_test_helper.h index a090eee7..0360328 100644 --- a/ash/common/test/workspace_event_handler_test_helper.h +++ b/ash/test/workspace_event_handler_test_helper.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_ -#define ASH_COMMON_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_ +#ifndef ASH_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_ +#define ASH_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_ -#include "ash/common/wm/workspace/workspace_event_handler.h" +#include "ash/wm/workspace/workspace_event_handler.h" #include "base/macros.h" @@ -28,4 +28,4 @@ } // namespace ash -#endif // ASH_COMMON_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_ +#endif // ASH_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
diff --git a/ash/touch/touch_uma.h b/ash/touch/touch_uma.h index 480cb3de..805f059 100644 --- a/ash/touch/touch_uma.h +++ b/ash/touch/touch_uma.h
@@ -6,7 +6,7 @@ #define ASH_TOUCH_TOUCH_OBSERVER_UMA_H_ #include "ash/ash_export.h" -#include "ash/common/metrics/gesture_action_type.h" +#include "ash/metrics/gesture_action_type.h" #include "base/macros.h" #include "base/memory/singleton.h"
diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc index 4e3c4b1..d19ad09 100644 --- a/ash/virtual_keyboard_controller.cc +++ b/ash/virtual_keyboard_controller.cc
@@ -7,12 +7,12 @@ #include <vector> #include "ash/common/keyboard/keyboard_ui.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" #include "base/strings/string_util.h" #include "ui/display/display.h"
diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc index 0ddfb33..7cf0a9fe 100644 --- a/ash/virtual_keyboard_controller_unittest.cc +++ b/ash/virtual_keyboard_controller_unittest.cc
@@ -7,13 +7,13 @@ #include <utility> #include <vector> -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "base/command_line.h" #include "ui/events/devices/device_data_manager.h" #include "ui/events/devices/device_hotplug_event_observer.h"
diff --git a/ash/common/wm/always_on_top_controller.cc b/ash/wm/always_on_top_controller.cc similarity index 95% rename from ash/common/wm/always_on_top_controller.cc rename to ash/wm/always_on_top_controller.cc index d115f01..90ee7a1 100644 --- a/ash/common/wm/always_on_top_controller.cc +++ b/ash/wm/always_on_top_controller.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/always_on_top_controller.h" +#include "ash/wm/always_on_top_controller.h" -#include "ash/common/wm/workspace/workspace_layout_manager.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/workspace/workspace_layout_manager.h" #include "base/memory/ptr_util.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h"
diff --git a/ash/common/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h similarity index 90% rename from ash/common/wm/always_on_top_controller.h rename to ash/wm/always_on_top_controller.h index bdf1446..4f33eeee 100644 --- a/ash/common/wm/always_on_top_controller.h +++ b/ash/wm/always_on_top_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_ -#define ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_ +#ifndef ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_ +#define ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_ #include <memory> @@ -48,4 +48,4 @@ } // namepsace ash -#endif // ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_ +#endif // ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc index 54dad32..70131d69 100644 --- a/ash/wm/always_on_top_controller_unittest.cc +++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/always_on_top_controller.h" +#include "ash/wm/always_on_top_controller.h" -#include "ash/common/wm/workspace/workspace_layout_manager.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/workspace/workspace_layout_manager.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc index 26adb0b8..2d4616a 100644 --- a/ash/wm/ash_focus_rules.cc +++ b/ash/wm/ash_focus_rules.cc
@@ -4,14 +4,14 @@ #include "ash/wm/ash_focus_rules.h" -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/focus_rules.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/container_finder.h" +#include "ash/wm/focus_rules.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h"
diff --git a/ash/wm/ash_focus_rules_unittest.cc b/ash/wm/ash_focus_rules_unittest.cc index faabf2d7..2ea7da9 100644 --- a/ash/wm/ash_focus_rules_unittest.cc +++ b/ash/wm/ash_focus_rules_unittest.cc
@@ -3,15 +3,15 @@ // found in the LICENSE file. #include "ash/common/session/session_state_delegate.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_helper.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/common/wm/container_finder.cc b/ash/wm/container_finder.cc similarity index 95% rename from ash/common/wm/container_finder.cc rename to ash/wm/container_finder.cc index ece5ca95..0efd32d 100644 --- a/ash/common/wm/container_finder.cc +++ b/ash/wm/container_finder.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/container_finder.h" +#include "ash/wm/container_finder.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/always_on_top_controller.h" -#include "ash/common/wm/root_window_finder.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/wm/always_on_top_controller.h" +#include "ash/wm/root_window_finder.h" +#include "ash/wm/window_state.h" #include "ui/gfx/geometry/rect.h" namespace ash {
diff --git a/ash/common/wm/container_finder.h b/ash/wm/container_finder.h similarity index 89% rename from ash/common/wm/container_finder.h rename to ash/wm/container_finder.h index a54e57a..7f90806 100644 --- a/ash/common/wm/container_finder.h +++ b/ash/wm/container_finder.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_CONTAINER_FINDER_H_ -#define ASH_COMMON_WM_CONTAINER_FINDER_H_ +#ifndef ASH_WM_CONTAINER_FINDER_H_ +#define ASH_WM_CONTAINER_FINDER_H_ #include <vector> @@ -39,4 +39,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_CONTAINER_FINDER_H_ +#endif // ASH_WM_CONTAINER_FINDER_H_
diff --git a/ash/common/wm/container_finder_unittest.cc b/ash/wm/container_finder_unittest.cc similarity index 92% rename from ash/common/wm/container_finder_unittest.cc rename to ash/wm/container_finder_unittest.cc index cf9f96d..7692c82 100644 --- a/ash/common/wm/container_finder_unittest.cc +++ b/ash/wm/container_finder_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/container_finder.h" +#include "ash/wm/container_finder.h" #include <memory> -#include "ash/common/test/ash_test.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/test/ash_test.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/wm/default_state.cc b/ash/wm/default_state.cc similarity index 98% rename from ash/common/wm/default_state.cc rename to ash/wm/default_state.cc index 8149d7f..404786e 100644 --- a/ash/common/wm/default_state.cc +++ b/ash/wm/default_state.cc
@@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/default_state.h" +#include "ash/wm/default_state.h" #include "ash/common/ash_switches.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/window_parenting_utils.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_delegate.h" -#include "ash/common/wm/window_state_util.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/window_animation_types.h" +#include "ash/wm/window_parenting_utils.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" +#include "ash/wm/window_state_delegate.h" +#include "ash/wm/window_state_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/common/wm/default_state.h b/ash/wm/default_state.h similarity index 94% rename from ash/common/wm/default_state.h rename to ash/wm/default_state.h index b7cee4c0..d48da36 100644 --- a/ash/common/wm/default_state.h +++ b/ash/wm/default_state.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DEFAULT_STATE_H_ -#define ASH_COMMON_WM_DEFAULT_STATE_H_ +#ifndef ASH_WM_DEFAULT_STATE_H_ +#define ASH_WM_DEFAULT_STATE_H_ -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include "base/macros.h" #include "ui/display/display.h" #include "ui/gfx/geometry/rect.h" @@ -79,4 +79,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_DEFAULT_STATE_H_ +#endif // ASH_WM_DEFAULT_STATE_H_
diff --git a/ash/common/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc similarity index 93% rename from ash/common/wm/default_window_resizer.cc rename to ash/wm/default_window_resizer.cc index 6a6102a..98943add 100644 --- a/ash/common/wm/default_window_resizer.cc +++ b/ash/wm/default_window_resizer.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/default_window_resizer.h" +#include "ash/wm/default_window_resizer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_state.h" namespace ash {
diff --git a/ash/common/wm/default_window_resizer.h b/ash/wm/default_window_resizer.h similarity index 87% rename from ash/common/wm/default_window_resizer.h rename to ash/wm/default_window_resizer.h index 34022ca..7919a638 100644 --- a/ash/common/wm/default_window_resizer.h +++ b/ash/wm/default_window_resizer.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_ -#define ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_ +#ifndef ASH_WM_DEFAULT_WINDOW_RESIZER_H_ +#define ASH_WM_DEFAULT_WINDOW_RESIZER_H_ #include "ash/ash_export.h" -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/window_resizer.h" #include "base/macros.h" namespace ash { @@ -48,4 +48,4 @@ } // namespace aura -#endif // ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_ +#endif // ASH_WM_DEFAULT_WINDOW_RESIZER_H_
diff --git a/ash/common/wm/dock/dock_types.h b/ash/wm/dock/dock_types.h similarity index 93% rename from ash/common/wm/dock/dock_types.h rename to ash/wm/dock/dock_types.h index 02e8b450..8ca97f1 100644 --- a/ash/common/wm/dock/dock_types.h +++ b/ash/wm/dock/dock_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DOCK_DOCK_TYPES_H_ -#define ASH_COMMON_WM_DOCK_DOCK_TYPES_H_ +#ifndef ASH_WM_DOCK_DOCK_TYPES_H_ +#define ASH_WM_DOCK_DOCK_TYPES_H_ namespace ash { @@ -50,4 +50,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_DOCK_DOCK_TYPES_H_ +#endif // ASH_WM_DOCK_DOCK_TYPES_H_
diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc similarity index 98% rename from ash/common/wm/dock/docked_window_layout_manager.cc rename to ash/wm/dock/docked_window_layout_manager.cc index fb373ec..86ddad13 100644 --- a/ash/common/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -2,24 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/animation/animation_change_type.h" -#include "ash/common/shelf/shelf_background_animator.h" -#include "ash/common/shelf/shelf_background_animator_observer.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_observer.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/window_parenting_utils.h" -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_background_animator.h" +#include "ash/shelf/shelf_background_animator_observer.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_observer.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/window_animation_types.h" +#include "ash/wm/window_parenting_utils.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/auto_reset.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/common/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h similarity index 96% rename from ash/common/wm/dock/docked_window_layout_manager.h rename to ash/wm/dock/docked_window_layout_manager.h index a3f5784d..956a21c 100644 --- a/ash/common/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/dock/docked_window_layout_manager.h
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ #include <memory> #include "ash/ash_export.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/dock/dock_types.h" -#include "ash/common/wm/dock/docked_window_layout_manager_observer.h" -#include "ash/common/wm/window_state_observer.h" -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" #include "ash/common/wm_activation_observer.h" +#include "ash/wm/dock/dock_types.h" +#include "ash/wm/dock/docked_window_layout_manager_observer.h" +#include "ash/wm/window_state_observer.h" +#include "ash/wm/wm_snap_to_pixel_layout_manager.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" @@ -319,4 +319,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
diff --git a/ash/common/wm/dock/docked_window_layout_manager_observer.h b/ash/wm/dock/docked_window_layout_manager_observer.h similarity index 82% rename from ash/common/wm/dock/docked_window_layout_manager_observer.h rename to ash/wm/dock/docked_window_layout_manager_observer.h index 5a3484f..34d6546 100644 --- a/ash/common/wm/dock/docked_window_layout_manager_observer.h +++ b/ash/wm/dock/docked_window_layout_manager_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ -#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#ifndef ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ #include "ash/ash_export.h" @@ -36,4 +36,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index d3426e7..9e4b3f7 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/common/ash_switches.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" #include "ash/test/shell_test_api.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h"
diff --git a/ash/common/wm/dock/docked_window_resizer.cc b/ash/wm/dock/docked_window_resizer.cc similarity index 97% rename from ash/common/wm/dock/docked_window_resizer.cc rename to ash/wm/dock/docked_window_resizer.cc index f2ea238..68f4da5 100644 --- a/ash/common/wm/dock/docked_window_resizer.cc +++ b/ash/wm/dock/docked_window_resizer.cc
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/dock/docked_window_resizer.h" +#include "ash/wm/dock/docked_window_resizer.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/window_parenting_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace/magnetism_matcher.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" #include "ash/shell.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/window_parenting_utils.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace/magnetism_matcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h"
diff --git a/ash/common/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h similarity index 93% rename from ash/common/wm/dock/docked_window_resizer.h rename to ash/wm/dock/docked_window_resizer.h index 277bde8..e1144b4a 100644 --- a/ash/common/wm/dock/docked_window_resizer.h +++ b/ash/wm/dock/docked_window_resizer.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ -#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ +#ifndef ASH_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ +#define ASH_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/dock/dock_types.h" -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/dock/dock_types.h" +#include "ash/wm/window_resizer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" @@ -98,4 +98,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ +#endif // ASH_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 7cf4583..4e607de 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc
@@ -2,16 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/dock/docked_window_resizer.h" +#include "ash/wm/dock/docked_window_resizer.h" #include "ash/common/ash_switches.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/window_tree_host_manager.h" @@ -20,12 +13,19 @@ #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/wm/drag_window_resizer.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_parenting_client.h"
diff --git a/ash/common/wm/drag_details.cc b/ash/wm/drag_details.cc similarity index 96% rename from ash/common/wm/drag_details.cc rename to ash/wm/drag_details.cc index 4a91826..97dce25b 100644 --- a/ash/common/wm/drag_details.cc +++ b/ash/wm/drag_details.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/drag_details.h" +#include "ash/wm/drag_details.h" -#include "ash/common/wm/window_resizer.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" +#include "ash/wm/window_resizer.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h"
diff --git a/ash/common/wm/drag_details.h b/ash/wm/drag_details.h similarity index 91% rename from ash/common/wm/drag_details.h rename to ash/wm/drag_details.h index 0ea810d..6f7d596f 100644 --- a/ash/common/wm/drag_details.h +++ b/ash/wm/drag_details.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_DRAG_DETAILS_H_ -#define ASH_COMMON_WM_DRAG_DETAILS_H_ +#ifndef ASH_WM_DRAG_DETAILS_H_ +#define ASH_WM_DRAG_DETAILS_H_ #include "ash/ash_export.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_types.h" #include "ui/gfx/geometry/rect.h" #include "ui/wm/public/window_move_client.h" @@ -61,4 +61,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_DRAG_DETAILS_H_ +#endif // ASH_WM_DRAG_DETAILS_H_
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 0ccaf949..b792990 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc
@@ -4,12 +4,12 @@ #include "ash/wm/drag_window_resizer.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/shell.h" #include "ash/wm/drag_window_controller.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/memory/weak_ptr.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h index ab49be7d..b8831528 100644 --- a/ash/wm/drag_window_resizer.h +++ b/ash/wm/drag_window_resizer.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/window_resizer.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/macros.h"
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index c0514a7..37e71150 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -4,16 +4,16 @@ #include "ash/wm/drag_window_resizer.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/wm/window_positioning_utils.h" #include "ash/common/wm_window.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/wm/drag_window_controller.h" +#include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/ash/common/wm/focus_rules.cc b/ash/wm/focus_rules.cc similarity index 95% rename from ash/common/wm/focus_rules.cc rename to ash/wm/focus_rules.cc index e0634e62..bfe3df6 100644 --- a/ash/common/wm/focus_rules.cc +++ b/ash/wm/focus_rules.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/focus_rules.h" +#include "ash/wm/focus_rules.h" #include "ash/common/shell_delegate.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/window_state.h" namespace ash {
diff --git a/ash/common/wm/focus_rules.h b/ash/wm/focus_rules.h similarity index 82% rename from ash/common/wm/focus_rules.h rename to ash/wm/focus_rules.h index cd54d32..bd3e62f 100644 --- a/ash/common/wm/focus_rules.h +++ b/ash/wm/focus_rules.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_FOCUS_RULES_H_ -#define ASH_COMMON_WM_FOCUS_RULES_H_ +#ifndef ASH_WM_FOCUS_RULES_H_ +#define ASH_WM_FOCUS_RULES_H_ #include "ash/ash_export.h" @@ -19,4 +19,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_FOCUS_RULES_H_ +#endif // ASH_WM_FOCUS_RULES_H_
diff --git a/ash/common/wm/fullscreen_window_finder.cc b/ash/wm/fullscreen_window_finder.cc similarity index 92% rename from ash/common/wm/fullscreen_window_finder.cc rename to ash/wm/fullscreen_window_finder.cc index ee1bef34..90704f4 100644 --- a/ash/common/wm/fullscreen_window_finder.cc +++ b/ash/wm/fullscreen_window_finder.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/fullscreen_window_finder.h" +#include "ash/wm/fullscreen_window_finder.h" -#include "ash/common/wm/switchable_windows.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/switchable_windows.h" +#include "ash/wm/window_state.h" #include "ui/compositor/layer.h" namespace ash {
diff --git a/ash/common/wm/fullscreen_window_finder.h b/ash/wm/fullscreen_window_finder.h similarity index 76% rename from ash/common/wm/fullscreen_window_finder.h rename to ash/wm/fullscreen_window_finder.h index f5c78b9..3831eb4 100644 --- a/ash/common/wm/fullscreen_window_finder.h +++ b/ash/wm/fullscreen_window_finder.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_ -#define ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_ +#ifndef ASH_WM_FULLSCREEN_WINDOW_FINDER_H_ +#define ASH_WM_FULLSCREEN_WINDOW_FINDER_H_ #include "ash/ash_export.h" @@ -20,4 +20,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_ +#endif // ASH_WM_FULLSCREEN_WINDOW_FINDER_H_
diff --git a/ash/wm/gestures/overview_gesture_handler.cc b/ash/wm/gestures/overview_gesture_handler.cc index 8d84fee..aee408c 100644 --- a/ash/wm/gestures/overview_gesture_handler.cc +++ b/ash/wm/gestures/overview_gesture_handler.cc
@@ -4,8 +4,8 @@ #include "ash/wm/gestures/overview_gesture_handler.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" +#include "ash/wm/overview/window_selector_controller.h" #include "ui/events/event.h" #include "ui/events/event_constants.h"
diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc index 90d2639..ec5ee028 100644 --- a/ash/wm/gestures/overview_gesture_handler_unittest.cc +++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc
@@ -4,11 +4,11 @@ #include "ash/wm/gestures/overview_gesture_handler.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/overview/window_selector_controller.h" #include "ash/wm/window_util.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h"
diff --git a/ash/common/wm/immersive_context_ash.cc b/ash/wm/immersive_context_ash.cc similarity index 94% rename from ash/common/wm/immersive_context_ash.cc rename to ash/wm/immersive_context_ash.cc index c1cff55..2cfabb4b 100644 --- a/ash/common/wm/immersive_context_ash.cc +++ b/ash/wm/immersive_context_ash.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/immersive_context_ash.h" +#include "ash/wm/immersive_context_ash.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/shared/immersive_fullscreen_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/window_state.h" #include "base/logging.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/common/wm/immersive_context_ash.h b/ash/wm/immersive_context_ash.h similarity index 88% rename from ash/common/wm/immersive_context_ash.h rename to ash/wm/immersive_context_ash.h index 7beed73..71098e1 100644 --- a/ash/common/wm/immersive_context_ash.h +++ b/ash/wm/immersive_context_ash.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_ -#define ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_ +#ifndef ASH_WM_IMMERSIVE_CONTEXT_ASH_H_ +#define ASH_WM_IMMERSIVE_CONTEXT_ASH_H_ #include "ash/shared/immersive_context.h" #include "base/macros.h" @@ -33,4 +33,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_ +#endif // ASH_WM_IMMERSIVE_CONTEXT_ASH_H_
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index 45e67ae4..db136aa 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -4,16 +4,16 @@ #include "ash/shared/immersive_fullscreen_controller.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" #include "ash/shared/immersive_fullscreen_controller_delegate.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/immersive_fullscreen_controller_test_api.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h"
diff --git a/ash/common/wm/lock_layout_manager.cc b/ash/wm/lock_layout_manager.cc similarity index 95% rename from ash/common/wm/lock_layout_manager.cc rename to ash/wm/lock_layout_manager.cc index d66c5d42..d6b7766 100644 --- a/ash/common/wm/lock_layout_manager.cc +++ b/ash/wm/lock_layout_manager.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/lock_layout_manager.h" +#include "ash/wm/lock_layout_manager.h" -#include "ash/common/wm/lock_window_state.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/lock_window_state.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" #include "ui/events/event.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_util.h"
diff --git a/ash/common/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h similarity index 92% rename from ash/common/wm/lock_layout_manager.h rename to ash/wm/lock_layout_manager.h index 9ba7473..dc08d23d 100644 --- a/ash/common/wm/lock_layout_manager.h +++ b/ash/wm/lock_layout_manager.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_LOCK_LAYOUT_MANAGER_H_ +#define ASH_WM_LOCK_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/wm/wm_types.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/gfx/geometry/rect.h" @@ -82,4 +82,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_ +#endif // ASH_WM_LOCK_LAYOUT_MANAGER_H_
diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc index ca2bbf98..6d46717 100644 --- a/ash/wm/lock_layout_manager_unittest.cc +++ b/ash/wm/lock_layout_manager_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_state.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index 51af510..981fa83 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc
@@ -9,15 +9,15 @@ #include "ash/common/session/session_state_delegate.h" #include "ash/common/shutdown_controller.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/lock_state_controller_test_api.h" #include "ash/test/test_screenshot_delegate.h" #include "ash/test/test_session_state_animator.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/session_state_animator.h" #include "base/memory/ptr_util.h"
diff --git a/ash/common/wm/lock_state_observer.h b/ash/wm/lock_state_observer.h similarity index 81% rename from ash/common/wm/lock_state_observer.h rename to ash/wm/lock_state_observer.h index a7d30fa0..d247e828 100644 --- a/ash/common/wm/lock_state_observer.h +++ b/ash/wm/lock_state_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_LOCK_STATE_OBSERVER_H_ -#define ASH_COMMON_WM_LOCK_STATE_OBSERVER_H_ +#ifndef ASH_WM_LOCK_STATE_OBSERVER_H_ +#define ASH_WM_LOCK_STATE_OBSERVER_H_ #include "ash/ash_export.h" @@ -25,4 +25,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_LOCK_STATE_OBSERVER_H_ +#endif // ASH_WM_LOCK_STATE_OBSERVER_H_
diff --git a/ash/common/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc similarity index 94% rename from ash/common/wm/lock_window_state.cc rename to ash/wm/lock_window_state.cc index 63af76d6..7b36315 100644 --- a/ash/common/wm/lock_window_state.cc +++ b/ash/wm/lock_window_state.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/lock_window_state.h" +#include "ash/wm/lock_window_state.h" #include <utility> -#include "ash/common/wm/lock_layout_manager.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_delegate.h" -#include "ash/common/wm/window_state_util.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/lock_layout_manager.h" +#include "ash/wm/window_animation_types.h" +#include "ash/wm/window_state.h" +#include "ash/wm/window_state_delegate.h" +#include "ash/wm/window_state_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "base/memory/ptr_util.h" #include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/common/wm/lock_window_state.h b/ash/wm/lock_window_state.h similarity index 92% rename from ash/common/wm/lock_window_state.h rename to ash/wm/lock_window_state.h index e8abfc7..9a164ca 100644 --- a/ash/common/wm/lock_window_state.h +++ b/ash/wm/lock_window_state.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_LOCK_WINDOW_STATE_H_ -#define ASH_COMMON_WM_LOCK_WINDOW_STATE_H_ +#ifndef ASH_WM_LOCK_WINDOW_STATE_H_ +#define ASH_WM_LOCK_WINDOW_STATE_H_ -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include "base/macros.h" namespace ash { @@ -56,4 +56,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_LOCK_WINDOW_STATE_H_ +#endif // ASH_WM_LOCK_WINDOW_STATE_H_
diff --git a/ash/common/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc similarity index 98% rename from ash/common/wm/maximize_mode/maximize_mode_controller.cc rename to ash/wm/maximize_mode/maximize_mode_controller.cc index 6ea28be..7b1d9c2 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_controller.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include <utility> #include "ash/common/ash_switches.h" -#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" -#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "ash/common/wm_shell.h" +#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" #include "base/time/default_tick_clock.h"
diff --git a/ash/common/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h similarity index 97% rename from ash/common/wm/maximize_mode/maximize_mode_controller.h rename to ash/wm/maximize_mode/maximize_mode_controller.h index 32650fe..4d9a217f 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_controller.h +++ b/ash/wm/maximize_mode/maximize_mode_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_ -#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_ +#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_ +#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_ #include <memory> @@ -189,4 +189,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_ +#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc index b30af30..49fafcfbc 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include <math.h> #include <utility> #include <vector> #include "ash/common/ash_switches.h" -#include "ash/common/test/test_system_tray_delegate.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" +#include "ash/test/test_system_tray_delegate.h" +#include "ash/wm/overview/window_selector_controller.h" #include "base/command_line.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/user_action_tester.h"
diff --git a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/wm/maximize_mode/maximize_mode_event_handler.cc similarity index 93% rename from ash/common/wm/maximize_mode/maximize_mode_event_handler.cc rename to ash/wm/maximize_mode/maximize_mode_event_handler.cc index b337050..cfe077c0 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc +++ b/ash/wm/maximize_mode/maximize_mode_event_handler.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" +#include "ash/wm/maximize_mode/maximize_mode_event_handler.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" #include "ui/events/event.h" namespace ash {
diff --git a/ash/common/wm/maximize_mode/maximize_mode_event_handler.h b/ash/wm/maximize_mode/maximize_mode_event_handler.h similarity index 80% rename from ash/common/wm/maximize_mode/maximize_mode_event_handler.h rename to ash/wm/maximize_mode/maximize_mode_event_handler.h index bb7d6b5..658be05 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_event_handler.h +++ b/ash/wm/maximize_mode/maximize_mode_event_handler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_ -#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_ +#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_ +#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_ #include "base/macros.h" @@ -34,4 +34,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_ +#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h b/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h index 2107309..a6702f2 100644 --- a/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h +++ b/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_AURA_H_ #define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_AURA_H_ -#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" +#include "ash/wm/maximize_mode/maximize_mode_event_handler.h" #include "ui/events/event_handler.h" namespace ash {
diff --git a/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc similarity index 95% rename from ash/common/wm/maximize_mode/maximize_mode_window_manager.cc rename to ash/wm/maximize_mode/maximize_mode_window_manager.cc index 9cafa32..3b92f3c 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc
@@ -2,24 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" +#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" #include "ash/common/ash_switches.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" -#include "ash/common/wm/maximize_mode/maximize_mode_window_state.h" -#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" +#include "ash/wm/maximize_mode/maximize_mode_event_handler.h" +#include "ash/wm/maximize_mode/maximize_mode_window_state.h" +#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace_controller.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h"
diff --git a/ash/common/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h similarity index 95% rename from ash/common/wm/maximize_mode/maximize_mode_window_manager.h rename to ash/wm/maximize_mode/maximize_mode_window_manager.h index 4033c522..d1a532a3b 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_window_manager.h +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_ -#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_ +#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_ +#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_ #include <stdint.h> @@ -12,7 +12,7 @@ #include "ash/ash_export.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/display/display_observer.h" @@ -138,4 +138,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_ +#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc index b2f9411e..16cf02e 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -2,29 +2,29 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" +#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" #include <string> #include "ash/common/ash_switches.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/switchable_windows.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_observer.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/switchable_windows.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/window_state_observer.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/common/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc similarity index 97% rename from ash/common/wm/maximize_mode/maximize_mode_window_state.cc rename to ash/wm/maximize_mode/maximize_mode_window_state.cc index fc240bb7..8021bc49 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/maximize_mode_window_state.h" +#include "ash/wm/maximize_mode/maximize_mode_window_state.h" #include <utility> -#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/window_state_util.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" +#include "ash/wm/window_animation_types.h" +#include "ash/wm/window_state_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/common/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h similarity index 92% rename from ash/common/wm/maximize_mode/maximize_mode_window_state.h rename to ash/wm/maximize_mode/maximize_mode_window_state.h index 62f5b86..fe0878f 100644 --- a/ash/common/wm/maximize_mode/maximize_mode_window_state.h +++ b/ash/wm/maximize_mode/maximize_mode_window_state.h
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_ -#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_ +#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_ +#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_ #include <memory> -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include "base/macros.h" namespace ash { @@ -85,4 +85,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_ +#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h new file mode 100644 index 0000000..6a1cbde --- /dev/null +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h
@@ -0,0 +1,17 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_ +#define ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_ + +namespace ash { + +class ScopedDisableInternalMouseAndKeyboard { + public: + virtual ~ScopedDisableInternalMouseAndKeyboard() {} +}; + +} // namespace ash + +#endif // ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h index 835a45d..6783fcb 100644 --- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_OZONE_H_ #define ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_OZONE_H_ -#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "base/macros.h" namespace ash {
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h index ea69d79..6c8f47d 100644 --- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h
@@ -8,7 +8,7 @@ #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" #include "base/macros.h" #include "ui/events/platform/platform_event_observer.h" #include "ui/gfx/geometry/point.h"
diff --git a/ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc similarity index 97% rename from ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc rename to ash/wm/maximize_mode/workspace_backdrop_delegate.cc index 51113c24..95c4596 100644 --- a/ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h" +#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "base/auto_reset.h" #include "ui/aura/window_observer.h" #include "ui/compositor/layer.h"
diff --git a/ash/common/wm/maximize_mode/workspace_backdrop_delegate.h b/ash/wm/maximize_mode/workspace_backdrop_delegate.h similarity index 87% rename from ash/common/wm/maximize_mode/workspace_backdrop_delegate.h rename to ash/wm/maximize_mode/workspace_backdrop_delegate.h index 4145c2cb..a7e574d 100644 --- a/ash/common/wm/maximize_mode/workspace_backdrop_delegate.h +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_ -#define ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_ +#ifndef ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_ +#define ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "base/macros.h" namespace views { @@ -70,4 +70,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_ +#endif // ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
diff --git a/ash/common/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc similarity index 96% rename from ash/common/wm/mru_window_tracker.cc rename to ash/wm/mru_window_tracker.cc index df687d8..c9e59805 100644 --- a/ash/common/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/mru_window_tracker.h" +#include "ash/wm/mru_window_tracker.h" #include <algorithm> -#include "ash/common/wm/focus_rules.h" -#include "ash/common/wm/switchable_windows.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/focus_rules.h" +#include "ash/wm/switchable_windows.h" +#include "ash/wm/window_state.h" #include "base/bind.h" #include "ui/aura/window.h"
diff --git a/ash/common/wm/mru_window_tracker.h b/ash/wm/mru_window_tracker.h similarity index 93% rename from ash/common/wm/mru_window_tracker.h rename to ash/wm/mru_window_tracker.h index 1c820e3..76ec2db 100644 --- a/ash/common/wm/mru_window_tracker.h +++ b/ash/wm/mru_window_tracker.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_MRU_WINDOW_TRACKER_H_ -#define ASH_COMMON_WM_MRU_WINDOW_TRACKER_H_ +#ifndef ASH_WM_MRU_WINDOW_TRACKER_H_ +#define ASH_WM_MRU_WINDOW_TRACKER_H_ #include <list> #include <vector> @@ -65,4 +65,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_MRU_WINDOW_TRACKER_H_ +#endif // ASH_WM_MRU_WINDOW_TRACKER_H_
diff --git a/ash/common/wm/mru_window_tracker_unittest.cc b/ash/wm/mru_window_tracker_unittest.cc similarity index 96% rename from ash/common/wm/mru_window_tracker_unittest.cc rename to ash/wm/mru_window_tracker_unittest.cc index cf92338fb..3e83708 100644 --- a/ash/common/wm/mru_window_tracker_unittest.cc +++ b/ash/wm/mru_window_tracker_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/mru_window_tracker.h" +#include "ash/wm/mru_window_tracker.h" -#include "ash/common/test/ash_test.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/test/ash_test.h" +#include "ash/wm/window_state.h" #include "ui/base/hit_test.h" namespace ash {
diff --git a/ash/common/wm/overview/cleanup_animation_observer.cc b/ash/wm/overview/cleanup_animation_observer.cc similarity index 93% rename from ash/common/wm/overview/cleanup_animation_observer.cc rename to ash/wm/overview/cleanup_animation_observer.cc index 9feed4c..32f9c98 100644 --- a/ash/common/wm/overview/cleanup_animation_observer.cc +++ b/ash/wm/overview/cleanup_animation_observer.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/cleanup_animation_observer.h" +#include "ash/wm/overview/cleanup_animation_observer.h" #include "ui/views/widget/widget.h"
diff --git a/ash/common/wm/overview/cleanup_animation_observer.h b/ash/wm/overview/cleanup_animation_observer.h similarity index 82% rename from ash/common/wm/overview/cleanup_animation_observer.h rename to ash/wm/overview/cleanup_animation_observer.h index a3ad4ffd..06e5757e 100644 --- a/ash/common/wm/overview/cleanup_animation_observer.h +++ b/ash/wm/overview/cleanup_animation_observer.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_ -#define ASH_COMMON_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_ +#ifndef ASH_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_ +#define ASH_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/overview/window_selector_delegate.h" +#include "ash/wm/overview/window_selector_delegate.h" #include "base/macros.h" #include "ui/compositor/layer_animation_observer.h" @@ -45,4 +45,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_ +#endif // ASH_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
diff --git a/ash/common/wm/overview/cleanup_animation_observer_unittest.cc b/ash/wm/overview/cleanup_animation_observer_unittest.cc similarity index 97% rename from ash/common/wm/overview/cleanup_animation_observer_unittest.cc rename to ash/wm/overview/cleanup_animation_observer_unittest.cc index a4db1ed..4a16de6 100644 --- a/ash/common/wm/overview/cleanup_animation_observer_unittest.cc +++ b/ash/wm/overview/cleanup_animation_observer_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/cleanup_animation_observer.h" +#include "ash/wm/overview/cleanup_animation_observer.h" #include <vector> -#include "ash/common/wm/overview/window_selector_delegate.h" #include "ash/common/wm_window.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/overview/window_selector_delegate.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/common/wm/overview/overview_animation_type.h b/ash/wm/overview/overview_animation_type.h similarity index 87% rename from ash/common/wm/overview/overview_animation_type.h rename to ash/wm/overview/overview_animation_type.h index 4f8f03f31..089277e 100644 --- a/ash/common/wm/overview/overview_animation_type.h +++ b/ash/wm/overview/overview_animation_type.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_ -#define ASH_COMMON_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_ +#ifndef ASH_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_ +#define ASH_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_ namespace ash { @@ -32,4 +32,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_ +#endif // ASH_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
diff --git a/ash/common/wm/overview/scoped_overview_animation_settings.h b/ash/wm/overview/scoped_overview_animation_settings.h similarity index 73% rename from ash/common/wm/overview/scoped_overview_animation_settings.h rename to ash/wm/overview/scoped_overview_animation_settings.h index a5176ed..a8898bfb 100644 --- a/ash/common/wm/overview/scoped_overview_animation_settings.h +++ b/ash/wm/overview/scoped_overview_animation_settings.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ -#define ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ +#ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ +#define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ namespace ui { class ImplicitAnimationObserver; @@ -21,4 +21,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ +#endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
diff --git a/ash/wm/overview/scoped_overview_animation_settings_aura.h b/ash/wm/overview/scoped_overview_animation_settings_aura.h index 966b0edc..2203ff2 100644 --- a/ash/wm/overview/scoped_overview_animation_settings_aura.h +++ b/ash/wm/overview/scoped_overview_animation_settings_aura.h
@@ -7,8 +7,8 @@ #include <memory> -#include "ash/common/wm/overview/overview_animation_type.h" -#include "ash/common/wm/overview/scoped_overview_animation_settings.h" +#include "ash/wm/overview/overview_animation_type.h" +#include "ash/wm/overview/scoped_overview_animation_settings.h" #include "base/macros.h" namespace aura {
diff --git a/ash/common/wm/overview/scoped_overview_animation_settings_factory.cc b/ash/wm/overview/scoped_overview_animation_settings_factory.cc similarity index 90% rename from ash/common/wm/overview/scoped_overview_animation_settings_factory.cc rename to ash/wm/overview/scoped_overview_animation_settings_factory.cc index ebe5f528..5efc30d6 100644 --- a/ash/common/wm/overview/scoped_overview_animation_settings_factory.cc +++ b/ash/wm/overview/scoped_overview_animation_settings_factory.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h" +#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" #include "base/logging.h"
diff --git a/ash/common/wm/overview/scoped_overview_animation_settings_factory.h b/ash/wm/overview/scoped_overview_animation_settings_factory.h similarity index 73% rename from ash/common/wm/overview/scoped_overview_animation_settings_factory.h rename to ash/wm/overview/scoped_overview_animation_settings_factory.h index e0340e1..cb23ce3 100644 --- a/ash/common/wm/overview/scoped_overview_animation_settings_factory.h +++ b/ash/wm/overview/scoped_overview_animation_settings_factory.h
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_ -#define ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_ +#ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_ +#define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_ #include <memory> -#include "ash/common/wm/overview/overview_animation_type.h" +#include "ash/wm/overview/overview_animation_type.h" namespace ash { @@ -33,4 +33,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_ +#endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
diff --git a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h index acad829..41ce23c4 100644 --- a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h +++ b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h" +#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" #include "base/macros.h" namespace ash {
diff --git a/ash/common/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc similarity index 97% rename from ash/common/wm/overview/scoped_transform_overview_window.cc rename to ash/wm/overview/scoped_transform_overview_window.cc index db63b3d..99810eb 100644 --- a/ash/common/wm/overview/scoped_transform_overview_window.cc +++ b/ash/wm/overview/scoped_transform_overview_window.cc
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/scoped_transform_overview_window.h" +#include "ash/wm/overview/scoped_transform_overview_window.h" #include <algorithm> #include <vector> -#include "ash/common/wm/overview/scoped_overview_animation_settings.h" -#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h" -#include "ash/common/wm/overview/window_selector_item.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/wm/overview/scoped_overview_animation_settings.h" +#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" +#include "ash/wm/overview/window_selector_item.h" +#include "ash/wm/window_state.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/single_thread_task_runner.h"
diff --git a/ash/common/wm/overview/scoped_transform_overview_window.h b/ash/wm/overview/scoped_transform_overview_window.h similarity index 96% rename from ash/common/wm/overview/scoped_transform_overview_window.h rename to ash/wm/overview/scoped_transform_overview_window.h index c197e64..f57a5cb 100644 --- a/ash/common/wm/overview/scoped_transform_overview_window.h +++ b/ash/wm/overview/scoped_transform_overview_window.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ -#define ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ +#ifndef ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ +#define ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ #include <memory> #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm/overview/overview_animation_type.h" +#include "ash/wm/overview/overview_animation_type.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "third_party/skia/include/core/SkColor.h" @@ -195,4 +195,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ +#endif // ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
diff --git a/ash/common/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc similarity index 97% rename from ash/common/wm/overview/window_grid.cc rename to ash/wm/overview/window_grid.cc index eced1f5..8b2a68d 100644 --- a/ash/common/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/window_grid.h" +#include "ash/wm/overview/window_grid.h" #include <algorithm> #include <functional> @@ -11,20 +11,20 @@ #include <vector> #include "ash/common/ash_switches.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/overview/cleanup_animation_observer.h" -#include "ash/common/wm/overview/scoped_overview_animation_settings.h" -#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h" -#include "ash/common/wm/overview/window_selector.h" -#include "ash/common/wm/overview/window_selector_delegate.h" -#include "ash/common/wm/overview/window_selector_item.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/overview/cleanup_animation_observer.h" +#include "ash/wm/overview/scoped_overview_animation_settings.h" +#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" +#include "ash/wm/overview/window_selector.h" +#include "ash/wm/overview/window_selector_delegate.h" +#include "ash/wm/overview/window_selector_item.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_screen_util.h" #include "base/command_line.h" #include "base/i18n/string_search.h" #include "base/memory/ptr_util.h"
diff --git a/ash/common/wm/overview/window_grid.h b/ash/wm/overview/window_grid.h similarity index 96% rename from ash/common/wm/overview/window_grid.h rename to ash/wm/overview/window_grid.h index 67f4f56..e7d7115 100644 --- a/ash/common/wm/overview/window_grid.h +++ b/ash/wm/overview/window_grid.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_GRID_H_ -#define ASH_COMMON_WM_OVERVIEW_WINDOW_GRID_H_ +#ifndef ASH_WM_OVERVIEW_WINDOW_GRID_H_ +#define ASH_WM_OVERVIEW_WINDOW_GRID_H_ #include <stddef.h> @@ -11,8 +11,8 @@ #include <set> #include <vector> -#include "ash/common/wm/overview/window_selector.h" -#include "ash/common/wm/window_state_observer.h" +#include "ash/wm/overview/window_selector.h" +#include "ash/wm/window_state_observer.h" #include "base/macros.h" #include "base/scoped_observer.h" #include "ui/aura/window_observer.h" @@ -195,4 +195,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_GRID_H_ +#endif // ASH_WM_OVERVIEW_WINDOW_GRID_H_
diff --git a/ash/common/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc similarity index 97% rename from ash/common/wm/overview/window_selector.cc rename to ash/wm/overview/window_selector.cc index 1905eaf..ac05f0a 100644 --- a/ash/common/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/window_selector.h" +#include "ash/wm/overview/window_selector.h" #include <algorithm> #include <functional> @@ -12,20 +12,20 @@ #include "ash/common/accessibility_delegate.h" #include "ash/common/accessibility_types.h" -#include "ash/common/metrics/user_metrics_action.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_grid.h" -#include "ash/common/wm/overview/window_selector_delegate.h" -#include "ash/common/wm/overview/window_selector_item.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/switchable_windows.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_grid.h" +#include "ash/wm/overview/window_selector_delegate.h" +#include "ash/wm/overview/window_selector_item.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/switchable_windows.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_screen_util.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h"
diff --git a/ash/common/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h similarity index 97% rename from ash/common/wm/overview/window_selector.h rename to ash/wm/overview/window_selector.h index a5cb743..31b980f 100644 --- a/ash/common/wm/overview/window_selector.h +++ b/ash/wm/overview/window_selector.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_ -#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_ +#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_ +#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_ #include <stddef.h> #include <stdint.h> @@ -197,4 +197,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_ +#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
diff --git a/ash/common/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc similarity index 95% rename from ash/common/wm/overview/window_selector_controller.cc rename to ash/wm/overview/window_selector_controller.cc index 8aa0d24..f74771f 100644 --- a/ash/common/wm/overview/window_selector_controller.cc +++ b/ash/wm/overview/window_selector_controller.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/window_selector_controller.h" +#include "ash/wm/overview/window_selector_controller.h" #include <vector> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/window_selector.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/system/tray/system_tray_delegate.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/window_selector.h" +#include "ash/wm/window_state.h" #include "base/metrics/histogram_macros.h" namespace ash {
diff --git a/ash/common/wm/overview/window_selector_controller.h b/ash/wm/overview/window_selector_controller.h similarity index 88% rename from ash/common/wm/overview/window_selector_controller.h rename to ash/wm/overview/window_selector_controller.h index 830ee92..83dcdb3 100644 --- a/ash/common/wm/overview/window_selector_controller.h +++ b/ash/wm/overview/window_selector_controller.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ -#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ +#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ +#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ #include <list> #include <memory> #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm/overview/window_selector.h" -#include "ash/common/wm/overview/window_selector_delegate.h" +#include "ash/wm/overview/window_selector.h" +#include "ash/wm/overview/window_selector_delegate.h" #include "base/macros.h" #include "base/time/time.h" @@ -75,4 +75,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_ +#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
diff --git a/ash/common/wm/overview/window_selector_delegate.h b/ash/wm/overview/window_selector_delegate.h similarity index 90% rename from ash/common/wm/overview/window_selector_delegate.h rename to ash/wm/overview/window_selector_delegate.h index 655198d3..021cede 100644 --- a/ash/common/wm/overview/window_selector_delegate.h +++ b/ash/wm/overview/window_selector_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_ -#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_ +#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_ +#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_ #include "ash/ash_export.h" #include "base/compiler_specific.h" @@ -51,4 +51,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_ +#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
diff --git a/ash/common/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc similarity index 97% rename from ash/common/wm/overview/window_selector_item.cc rename to ash/wm/overview/window_selector_item.cc index f6a7b94..34dd1e5 100644 --- a/ash/common/wm/overview/window_selector_item.cc +++ b/ash/wm/overview/window_selector_item.cc
@@ -2,27 +2,27 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/window_selector_item.h" +#include "ash/wm/overview/window_selector_item.h" #include <algorithm> #include <vector> #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/metrics/user_metrics_action.h" -#include "ash/common/wm/overview/cleanup_animation_observer.h" -#include "ash/common/wm/overview/overview_animation_type.h" -#include "ash/common/wm/overview/scoped_overview_animation_settings.h" -#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h" -#include "ash/common/wm/overview/scoped_transform_overview_window.h" -#include "ash/common/wm/overview/window_selector.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" #include "ash/strings/grit/ash_strings.h" +#include "ash/wm/overview/cleanup_animation_observer.h" +#include "ash/wm/overview/overview_animation_type.h" +#include "ash/wm/overview/scoped_overview_animation_settings.h" +#include "ash/wm/overview/scoped_overview_animation_settings_factory.h" +#include "ash/wm/overview/scoped_transform_overview_window.h" +#include "ash/wm/overview/window_selector.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/window_state.h" #include "base/auto_reset.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ash/common/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h similarity index 96% rename from ash/common/wm/overview/window_selector_item.h rename to ash/wm/overview/window_selector_item.h index 097cc8b4..7d58e72 100644 --- a/ash/common/wm/overview/window_selector_item.h +++ b/ash/wm/overview/window_selector_item.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ -#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ +#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ +#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/overview/scoped_transform_overview_window.h" +#include "ash/wm/overview/scoped_transform_overview_window.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/gfx/geometry/insets.h" @@ -221,4 +221,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ +#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index ebd23eb..682a10d 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc
@@ -8,34 +8,34 @@ #include "ash/common/accessibility_delegate.h" #include "ash/common/accessibility_types.h" #include "ash/common/ash_switches.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/overview/scoped_transform_overview_window.h" -#include "ash/common/wm/overview/window_grid.h" -#include "ash/common/wm/overview/window_selector.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/overview/window_selector_item.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/drag_drop/drag_drop_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" #include "ash/test/shell_test_api.h" #include "ash/test/test_app_list_view_presenter_impl.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/overview/scoped_transform_overview_window.h" +#include "ash/wm/overview/window_grid.h" +#include "ash/wm/overview/window_selector.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/overview/window_selector_item.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc index 6380b44..d7f50a6c 100644 --- a/ash/wm/panels/attached_panel_window_targeter.cc +++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -4,10 +4,10 @@ #include "ash/wm/panels/attached_panel_window_targeter.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/panels/panel_layout_manager.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/panels/panel_layout_manager.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/common/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc similarity index 95% rename from ash/common/wm/panels/panel_frame_view.cc rename to ash/wm/panels/panel_frame_view.cc index 67ef90c..5f7fe58 100644 --- a/ash/common/wm/panels/panel_frame_view.cc +++ b/ash/wm/panels/panel_frame_view.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/panels/panel_frame_view.h" +#include "ash/wm/panels/panel_frame_view.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/default_header_painter.h" -#include "ash/common/frame/frame_border_hit_test.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/default_header_painter.h" +#include "ash/frame/frame_border_hit_test.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h"
diff --git a/ash/common/wm/panels/panel_frame_view.h b/ash/wm/panels/panel_frame_view.h similarity index 93% rename from ash/common/wm/panels/panel_frame_view.h rename to ash/wm/panels/panel_frame_view.h index 6a1f2758..37e4af3 100644 --- a/ash/common/wm/panels/panel_frame_view.h +++ b/ash/wm/panels/panel_frame_view.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_PANELS_PANEL_FRAME_VIEW_H_ -#define ASH_COMMON_WM_PANELS_PANEL_FRAME_VIEW_H_ +#ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ +#define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ #include <memory> @@ -80,4 +80,4 @@ }; } -#endif // ASH_COMMON_WM_PANELS_PANEL_FRAME_VIEW_H_ +#endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
diff --git a/ash/common/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc similarity index 98% rename from ash/common/wm/panels/panel_layout_manager.cc rename to ash/wm/panels/panel_layout_manager.cc index eb8dd67..0ab5e965 100644 --- a/ash/common/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc
@@ -2,24 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/panels/panel_layout_manager.h" +#include "ash/wm/panels/panel_layout_manager.h" #include <algorithm> #include <map> #include <utility> -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/shelf/wm_shelf_util.h" -#include "ash/common/wm/overview/window_selector_controller.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/window_parenting_utils.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/shelf/wm_shelf_util.h" +#include "ash/wm/overview/window_selector_controller.h" +#include "ash/wm/window_animation_types.h" +#include "ash/wm/window_parenting_utils.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "base/auto_reset.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPath.h"
diff --git a/ash/common/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h similarity index 95% rename from ash/common/wm/panels/panel_layout_manager.h rename to ash/wm/panels/panel_layout_manager.h index ff1047e..7a435bb 100644 --- a/ash/common/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h
@@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ +#define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ #include <list> #include <memory> #include "ash/ash_export.h" -#include "ash/common/shelf/wm_shelf_observer.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/window_state_observer.h" #include "ash/common/wm_activation_observer.h" #include "ash/common/wm_display_observer.h" #include "ash/common/wm_layout_manager.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf_observer.h" +#include "ash/wm/window_state_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" @@ -202,4 +202,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ +#endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index 05bb294..f5c66c3 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -2,27 +2,27 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/panels/panel_layout_manager.h" +#include "ash/wm/panels/panel_layout_manager.h" -#include "ash/common/shelf/shelf_button.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/web_notification/web_notification_tray.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h"
diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc index 8cb9301..7736eac 100644 --- a/ash/wm/panels/panel_window_event_handler.cc +++ b/ash/wm/panels/panel_window_event_handler.cc
@@ -4,8 +4,8 @@ #include "ash/wm/panels/panel_window_event_handler.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h"
diff --git a/ash/common/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc similarity index 96% rename from ash/common/wm/panels/panel_window_resizer.cc rename to ash/wm/panels/panel_window_resizer.cc index e4047eb8..b7a051d8 100644 --- a/ash/common/wm/panels/panel_window_resizer.cc +++ b/ash/wm/panels/panel_window_resizer.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/panels/panel_window_resizer.h" +#include "ash/wm/panels/panel_window_resizer.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/window_parenting_utils.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/window_parenting_utils.h" +#include "ash/wm/window_state.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h"
diff --git a/ash/common/wm/panels/panel_window_resizer.h b/ash/wm/panels/panel_window_resizer.h similarity index 92% rename from ash/common/wm/panels/panel_window_resizer.h rename to ash/wm/panels/panel_window_resizer.h index dd8deed..09aef19 100644 --- a/ash/common/wm/panels/panel_window_resizer.h +++ b/ash/wm/panels/panel_window_resizer.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_ -#define ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_ +#ifndef ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_ +#define ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/window_resizer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" @@ -84,4 +84,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_ +#endif // ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index f81bd502..5242a1a 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -2,27 +2,27 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/panels/panel_window_resizer.h" +#include "ash/wm/panels/panel_window_resizer.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" +#include "ash/test/test_shelf_delegate.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" #include "base/i18n/rtl.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index 6fc2e40..0f88c8dc 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc
@@ -4,10 +4,9 @@ #include "ash/wm/power_button_controller.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/ash_switches.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" @@ -15,6 +14,7 @@ #include "ash/system/power/tablet_power_button_controller.h" #include "ash/system/tray/system_tray.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/session_state_animator.h" #include "base/command_line.h" #include "chromeos/audio/cras_audio_handler.h"
diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc index 3f81c73..2ee505e1 100644 --- a/ash/wm/resize_handle_window_targeter.cc +++ b/ash/wm/resize_handle_window_targeter.cc
@@ -5,8 +5,8 @@ #include "ash/wm/resize_handle_window_targeter.h" #include "ash/common/ash_constants.h" -#include "ash/common/wm/window_state.h" #include "ash/shared/immersive_fullscreen_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/events/event.h"
diff --git a/ash/wm/resize_handle_window_targeter.h b/ash/wm/resize_handle_window_targeter.h index 33478c3..eec69308 100644 --- a/ash/wm/resize_handle_window_targeter.h +++ b/ash/wm/resize_handle_window_targeter.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_ #define ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_ -#include "ash/common/wm/window_state_observer.h" +#include "ash/wm/window_state_observer.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_targeter.h"
diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc index 44de897..8c951e2 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc
@@ -3,13 +3,13 @@ // found in the LICENSE file. #include "ash/common/ash_constants.h" -#include "ash/common/frame/custom_frame_view_ash.h" -#include "ash/common/wm/window_state.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/wm/resize_shadow.h" #include "ash/wm/resize_shadow_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/bind.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/common/wm/root_window_finder.cc b/ash/wm/root_window_finder.cc similarity index 96% rename from ash/common/wm/root_window_finder.cc rename to ash/wm/root_window_finder.cc index 87c2da3..ae1224b 100644 --- a/ash/common/wm/root_window_finder.cc +++ b/ash/wm/root_window_finder.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/root_window_finder.h" +#include "ash/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h"
diff --git a/ash/common/wm/root_window_finder.h b/ash/wm/root_window_finder.h similarity index 84% rename from ash/common/wm/root_window_finder.h rename to ash/wm/root_window_finder.h index bfda8c9..ce568bf 100644 --- a/ash/common/wm/root_window_finder.h +++ b/ash/wm/root_window_finder.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_ -#define ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_ +#ifndef ASH_WM_ROOT_WINDOW_FINDER_H_ +#define ASH_WM_ROOT_WINDOW_FINDER_H_ #include "ash/ash_export.h" @@ -30,4 +30,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_ +#endif // ASH_WM_ROOT_WINDOW_FINDER_H_
diff --git a/ash/common/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc similarity index 97% rename from ash/common/wm/root_window_layout_manager.cc rename to ash/wm/root_window_layout_manager.cc index 15ec3fb..240f153a 100644 --- a/ash/common/wm/root_window_layout_manager.cc +++ b/ash/wm/root_window_layout_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/root_window_layout_manager.h" +#include "ash/wm/root_window_layout_manager.h" #include "ash/common/wm_window.h" #include "ui/aura/window.h"
diff --git a/ash/common/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h similarity index 87% rename from ash/common/wm/root_window_layout_manager.h rename to ash/wm/root_window_layout_manager.h index 677dfc8..3f93c0b 100644 --- a/ash/common/wm/root_window_layout_manager.h +++ b/ash/wm/root_window_layout_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ +#define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ #include "ash/common/wm_layout_manager.h" #include "base/macros.h" @@ -37,4 +37,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ +#endif // ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
diff --git a/ash/common/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc similarity index 94% rename from ash/common/wm/screen_dimmer.cc rename to ash/wm/screen_dimmer.cc index 2b697fa..abc0eea 100644 --- a/ash/common/wm/screen_dimmer.cc +++ b/ash/wm/screen_dimmer.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/screen_dimmer.h" +#include "ash/wm/screen_dimmer.h" -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/window_dimmer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/common/wm_window_user_data.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/container_finder.h" +#include "ash/wm/window_dimmer.h" #include "base/memory/ptr_util.h" namespace ash {
diff --git a/ash/common/wm/screen_dimmer.h b/ash/wm/screen_dimmer.h similarity index 94% rename from ash/common/wm/screen_dimmer.h rename to ash/wm/screen_dimmer.h index 1667b05..90064bfe 100644 --- a/ash/common/wm/screen_dimmer.h +++ b/ash/wm/screen_dimmer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_SCREEN_DIMMER_H_ -#define ASH_COMMON_WM_SCREEN_DIMMER_H_ +#ifndef ASH_WM_SCREEN_DIMMER_H_ +#define ASH_WM_SCREEN_DIMMER_H_ #include <memory> #include <vector> @@ -77,4 +77,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_SCREEN_DIMMER_H_ +#endif // ASH_WM_SCREEN_DIMMER_H_
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index 709886f..3591a17 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/screen_dimmer.h" +#include "ash/wm/screen_dimmer.h" #include <memory> -#include "ash/common/wm/window_dimmer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/common/wm_window_user_data.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_dimmer.h" #include "base/memory/ptr_util.h" #include "ui/aura/test/test_windows.h" #include "ui/compositor/layer.h"
diff --git a/ash/wm/screen_pinning_controller.cc b/ash/wm/screen_pinning_controller.cc index 72147115..3573c809 100644 --- a/ash/wm/screen_pinning_controller.cc +++ b/ash/wm/screen_pinning_controller.cc
@@ -7,14 +7,14 @@ #include <algorithm> #include <vector> -#include "ash/common/wm/container_finder.h" -#include "ash/common/wm/window_dimmer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/common/wm_window_user_data.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/container_finder.h" +#include "ash/wm/window_dimmer.h" +#include "ash/wm/window_state.h" #include "base/auto_reset.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/screen_pinning_controller_unittest.cc b/ash/wm/screen_pinning_controller_unittest.cc index 590f4941..5e8019e 100644 --- a/ash/wm/screen_pinning_controller_unittest.cc +++ b/ash/wm/screen_pinning_controller_unittest.cc
@@ -6,13 +6,13 @@ #include <vector> -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/stl_util.h" #include "ui/aura/window.h"
diff --git a/ash/wm/session_state_animator_impl.cc b/ash/wm/session_state_animator_impl.cc index c0be930..d205155 100644 --- a/ash/wm/session_state_animator_impl.cc +++ b/ash/wm/session_state_animator_impl.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "ash/common/wm/wm_window_animations.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/wm_window_animations.h" #include "base/memory/ptr_util.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index 723265d..fdb63c9 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc
@@ -4,8 +4,8 @@ #include "ash/wm/stacking_controller.h" -#include "ash/common/wm/container_finder.h" #include "ash/common/wm_window.h" +#include "ash/wm/container_finder.h" namespace ash {
diff --git a/ash/common/wm/switchable_windows.cc b/ash/wm/switchable_windows.cc similarity index 95% rename from ash/common/wm/switchable_windows.cc rename to ash/wm/switchable_windows.cc index efa1a9a..7eb572d4 100644 --- a/ash/common/wm/switchable_windows.cc +++ b/ash/wm/switchable_windows.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/switchable_windows.h" +#include "ash/wm/switchable_windows.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h"
diff --git a/ash/common/wm/switchable_windows.h b/ash/wm/switchable_windows.h similarity index 84% rename from ash/common/wm/switchable_windows.h rename to ash/wm/switchable_windows.h index e960a2f..4fc868a2 100644 --- a/ash/common/wm/switchable_windows.h +++ b/ash/wm/switchable_windows.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_ -#define ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_ +#ifndef ASH_WM_SWITCHABLE_WINDOWS_H_ +#define ASH_WM_SWITCHABLE_WINDOWS_H_ #include <stddef.h> @@ -28,4 +28,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_ +#endif // ASH_WM_SWITCHABLE_WINDOWS_H_
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index e5764a8..99944364 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -6,15 +6,15 @@ #include <vector> -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_model.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/ash/common/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc similarity index 98% rename from ash/common/wm/system_modal_container_layout_manager.cc rename to ash/wm/system_modal_container_layout_manager.cc index d6d8d040..46226cec 100644 --- a/ash/common/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/system_modal_container_layout_manager.h" +#include "ash/wm/system_modal_container_layout_manager.h" #include <cmath> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/window_dimmer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/window_dimmer.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/common/wm/system_modal_container_layout_manager.h b/ash/wm/system_modal_container_layout_manager.h similarity index 93% rename from ash/common/wm/system_modal_container_layout_manager.h rename to ash/wm/system_modal_container_layout_manager.h index 171b0f46..3e9a4230 100644 --- a/ash/common/wm/system_modal_container_layout_manager.h +++ b/ash/wm/system_modal_container_layout_manager.h
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ +#define ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ #include <memory> #include <set> #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/wm/wm_snap_to_pixel_layout_manager.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/keyboard/keyboard_controller_observer.h" @@ -113,4 +113,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_ +#endif // ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index ede38a7..3669016d 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/system_modal_container_layout_manager.h" +#include "ash/wm/system_modal_container_layout_manager.h" #include <memory> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/container_finder.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/container_finder.h" #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/compiler_specific.h"
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index fee1c16..04584c3f 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc
@@ -4,9 +4,9 @@ #include "ash/wm/toplevel_window_event_handler.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h index 171b174f..7a2bf45 100644 --- a/ash/wm/toplevel_window_event_handler.h +++ b/ash/wm/toplevel_window_event_handler.h
@@ -6,8 +6,8 @@ #define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ #include "ash/ash_export.h" -#include "ash/common/wm/wm_toplevel_window_event_handler.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_toplevel_window_event_handler.h" +#include "ash/wm/wm_types.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/events/event_handler.h"
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index 3581f69..f2d3655 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -4,9 +4,6 @@ #include "ash/wm/toplevel_window_event_handler.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_shell.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" @@ -14,8 +11,11 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/resize_shadow.h" #include "ash/wm/resize_shadow_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace_controller.h" #include "base/compiler_specific.h" #include "base/threading/thread_task_runner_handle.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index 18d9704..8cac55f 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc
@@ -4,11 +4,11 @@ #include "ash/wm/video_detector.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/env.h" #include "ui/aura/window.h"
diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc index 33a5c95..5894269 100644 --- a/ash/wm/video_detector_unittest.cc +++ b/ash/wm/video_detector_unittest.cc
@@ -7,11 +7,11 @@ #include <deque> #include <memory> -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" #include "base/compiler_specific.h" #include "base/time/time.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/common/wm/window_animation_types.h b/ash/wm/window_animation_types.h similarity index 81% rename from ash/common/wm/window_animation_types.h rename to ash/wm/window_animation_types.h index 4ea91c4..eb30c35 100644 --- a/ash/common/wm/window_animation_types.h +++ b/ash/wm/window_animation_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_ -#define ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_ +#ifndef ASH_WM_WINDOW_ANIMATION_TYPES_H_ +#define ASH_WM_WINDOW_ANIMATION_TYPES_H_ #include "ui/wm/core/window_animations.h" @@ -23,4 +23,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_ +#endif // ASH_WM_WINDOW_ANIMATION_TYPES_H_
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index c36a0c6..048aa95 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc
@@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_window.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/window_animation_types.h" #include "ash/wm/window_util.h" +#include "ash/wm/workspace_controller.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc index 69df3bf..a95d5f9e 100644 --- a/ash/wm/window_animations_unittest.cc +++ b/ash/wm/window_animations_unittest.cc
@@ -4,12 +4,12 @@ #include "ash/wm/window_animations.h" -#include "ash/common/wm/window_animation_types.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_animation_types.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/workspace_controller.h" #include "base/time/time.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h"
diff --git a/ash/common/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc similarity index 93% rename from ash/common/wm/window_cycle_controller.cc rename to ash/wm/window_cycle_controller.cc index 686290e5..f00183c 100644 --- a/ash/common/wm/window_cycle_controller.cc +++ b/ash/wm/window_cycle_controller.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_cycle_controller.h" +#include "ash/wm/window_cycle_controller.h" -#include "ash/common/metrics/task_switch_source.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_cycle_event_filter.h" -#include "ash/common/wm/window_cycle_list.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/metrics/task_switch_source.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_cycle_event_filter.h" +#include "ash/wm/window_cycle_list.h" +#include "ash/wm/window_state.h" #include "base/metrics/histogram_macros.h" namespace ash {
diff --git a/ash/common/wm/window_cycle_controller.h b/ash/wm/window_cycle_controller.h similarity index 94% rename from ash/common/wm/window_cycle_controller.h rename to ash/wm/window_cycle_controller.h index 87eedd9..65b354ce 100644 --- a/ash/common/wm/window_cycle_controller.h +++ b/ash/wm/window_cycle_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_CYCLE_CONTROLLER_H_ -#define ASH_COMMON_WM_WINDOW_CYCLE_CONTROLLER_H_ +#ifndef ASH_WM_WINDOW_CYCLE_CONTROLLER_H_ +#define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_ #include <memory> @@ -79,4 +79,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_CYCLE_CONTROLLER_H_ +#endif // ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index 8504f88..7e8546376 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_cycle_controller.h" +#include "ash/wm/window_cycle_controller.h" #include <algorithm> #include <memory> @@ -10,22 +10,22 @@ #include "ash/common/focus_cycler.h" #include "ash/common/scoped_root_window_for_new_windows.h" #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/window_cycle_list.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_view_test_api.h" #include "ash/test/test_app_list_view_presenter_impl.h" +#include "ash/test/test_shelf_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/window_cycle_list.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h"
diff --git a/ash/common/wm/window_cycle_event_filter.h b/ash/wm/window_cycle_event_filter.h similarity index 75% rename from ash/common/wm/window_cycle_event_filter.h rename to ash/wm/window_cycle_event_filter.h index 119179f..711aca2 100644 --- a/ash/common/wm/window_cycle_event_filter.h +++ b/ash/wm/window_cycle_event_filter.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_CYCLE_EVENT_FILTER_H_ -#define ASH_COMMON_WM_WINDOW_CYCLE_EVENT_FILTER_H_ +#ifndef ASH_WM_WINDOW_CYCLE_EVENT_FILTER_H_ +#define ASH_WM_WINDOW_CYCLE_EVENT_FILTER_H_ #include "ash/ash_export.h" @@ -18,4 +18,4 @@ } // namepsace ash -#endif // ASH_COMMON_WM_WINDOW_CYCLE_EVENT_FILTER_H_ +#endif // ASH_WM_WINDOW_CYCLE_EVENT_FILTER_H_
diff --git a/ash/wm/window_cycle_event_filter_aura.cc b/ash/wm/window_cycle_event_filter_aura.cc index 77ec193..9af1c1c 100644 --- a/ash/wm/window_cycle_event_filter_aura.cc +++ b/ash/wm/window_cycle_event_filter_aura.cc
@@ -4,11 +4,11 @@ #include "ash/wm/window_cycle_event_filter_aura.h" -#include "ash/common/accelerators/debug_commands.h" -#include "ash/common/wm/window_cycle_controller.h" -#include "ash/common/wm/window_cycle_list.h" +#include "ash/accelerators/debug_commands.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wm/window_cycle_controller.h" +#include "ash/wm/window_cycle_list.h" #include "ui/events/event.h" namespace ash {
diff --git a/ash/wm/window_cycle_event_filter_aura.h b/ash/wm/window_cycle_event_filter_aura.h index eb567f6..3cec0ce 100644 --- a/ash/wm/window_cycle_event_filter_aura.h +++ b/ash/wm/window_cycle_event_filter_aura.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_WINDOW_CYCLE_EVENT_FILTER_AURA_H_ #define ASH_WM_WINDOW_CYCLE_EVENT_FILTER_AURA_H_ -#include "ash/common/wm/window_cycle_event_filter.h" +#include "ash/wm/window_cycle_event_filter.h" #include "base/macros.h" #include "base/timer/timer.h" #include "ui/events/event_handler.h"
diff --git a/ash/common/wm/window_cycle_list.cc b/ash/wm/window_cycle_list.cc similarity index 98% rename from ash/common/wm/window_cycle_list.cc rename to ash/wm/window_cycle_list.cc index 78c7a77..0f1ea9a 100644 --- a/ash/common/wm/window_cycle_list.cc +++ b/ash/wm/window_cycle_list.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_cycle_list.h" +#include "ash/wm/window_cycle_list.h" #include <list> #include <map> -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" #include "base/command_line.h" #include "ui/accessibility/ax_node_data.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/common/wm/window_cycle_list.h b/ash/wm/window_cycle_list.h similarity index 94% rename from ash/common/wm/window_cycle_list.h rename to ash/wm/window_cycle_list.h index 36e89409..bbc06481 100644 --- a/ash/common/wm/window_cycle_list.h +++ b/ash/wm/window_cycle_list.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_ -#define ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_ +#ifndef ASH_WM_WINDOW_CYCLE_LIST_H_ +#define ASH_WM_WINDOW_CYCLE_LIST_H_ #include <memory> #include <vector> #include "ash/ash_export.h" -#include "ash/common/wm/window_cycle_controller.h" +#include "ash/wm/window_cycle_controller.h" #include "base/macros.h" #include "base/scoped_observer.h" #include "base/timer/timer.h" @@ -107,4 +107,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_ +#endif // ASH_WM_WINDOW_CYCLE_LIST_H_
diff --git a/ash/common/wm/window_dimmer.cc b/ash/wm/window_dimmer.cc similarity index 98% rename from ash/common/wm/window_dimmer.cc rename to ash/wm/window_dimmer.cc index c90d806..b43c2a83 100644 --- a/ash/common/wm/window_dimmer.cc +++ b/ash/wm/window_dimmer.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_dimmer.h" +#include "ash/wm/window_dimmer.h" #include <memory>
diff --git a/ash/common/wm/window_dimmer.h b/ash/wm/window_dimmer.h similarity index 100% rename from ash/common/wm/window_dimmer.h rename to ash/wm/window_dimmer.h
diff --git a/ash/wm/window_mirror_view.cc b/ash/wm/window_mirror_view.cc index 94dd847..16f19bf 100644 --- a/ash/wm/window_mirror_view.cc +++ b/ash/wm/window_mirror_view.cc
@@ -4,8 +4,8 @@ #include "ash/wm/window_mirror_view.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h"
diff --git a/ash/common/wm/window_parenting_utils.cc b/ash/wm/window_parenting_utils.cc similarity index 94% rename from ash/common/wm/window_parenting_utils.cc rename to ash/wm/window_parenting_utils.cc index 8a868a22..edf4c835 100644 --- a/ash/common/wm/window_parenting_utils.cc +++ b/ash/wm/window_parenting_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_parenting_utils.h" +#include "ash/wm/window_parenting_utils.h" #include "ash/common/wm_window.h"
diff --git a/ash/common/wm/window_parenting_utils.h b/ash/wm/window_parenting_utils.h similarity index 86% rename from ash/common/wm/window_parenting_utils.h rename to ash/wm/window_parenting_utils.h index 864e0aa1..86f5f8b 100644 --- a/ash/common/wm/window_parenting_utils.h +++ b/ash/wm/window_parenting_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_ -#define ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_ +#ifndef ASH_WM_WINDOW_PARENTING_UTILS_H_ +#define ASH_WM_WINDOW_PARENTING_UTILS_H_ namespace ash { @@ -27,4 +27,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_ +#endif // ASH_WM_WINDOW_PARENTING_UTILS_H_
diff --git a/ash/common/wm/window_positioner.cc b/ash/wm/window_positioner.cc similarity index 98% rename from ash/common/wm/window_positioner.cc rename to ash/wm/window_positioner.cc index dcea7bf..b58b153 100644 --- a/ash/common/wm/window_positioner.cc +++ b/ash/wm/window_positioner.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioner.h" +#include "ash/wm/window_positioner.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_screen_util.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/ash/common/wm/window_positioner.h b/ash/wm/window_positioner.h similarity index 96% rename from ash/common/wm/window_positioner.h rename to ash/wm/window_positioner.h index 85cdfd614..ade2c25a 100644 --- a/ash/common/wm/window_positioner.h +++ b/ash/wm/window_positioner.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_POSITIONER_H_ -#define ASH_COMMON_WM_WINDOW_POSITIONER_H_ +#ifndef ASH_WM_WINDOW_POSITIONER_H_ +#define ASH_WM_WINDOW_POSITIONER_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -128,4 +128,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_POSITIONER_H_ +#endif // ASH_WM_WINDOW_POSITIONER_H_
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc index 2bda5d7..7c5353b31 100644 --- a/ash/wm/window_positioner_unittest.cc +++ b/ash/wm/window_positioner_unittest.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioner.h" +#include "ash/wm/window_positioner.h" #include <string> #include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/shell/toplevel_window.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/strings/string_number_conversions.h" #include "ui/display/screen.h"
diff --git a/ash/common/wm/window_positioning_utils.cc b/ash/wm/window_positioning_utils.cc similarity index 96% rename from ash/common/wm/window_positioning_utils.cc rename to ash/wm/window_positioning_utils.cc index babed2f4..84000a6 100644 --- a/ash/common/wm/window_positioning_utils.cc +++ b/ash/wm/window_positioning_utils.cc
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioning_utils.h" +#include "ash/wm/window_positioning_utils.h" #include <algorithm> -#include "ash/common/wm/system_modal_container_layout_manager.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shell.h" +#include "ash/wm/system_modal_container_layout_manager.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "ui/aura/window_tracker.h" #include "ui/display/display.h" #include "ui/display/types/display_constants.h"
diff --git a/ash/common/wm/window_positioning_utils.h b/ash/wm/window_positioning_utils.h similarity index 92% rename from ash/common/wm/window_positioning_utils.h rename to ash/wm/window_positioning_utils.h index e515c5b..d8cd861c7 100644 --- a/ash/common/wm/window_positioning_utils.h +++ b/ash/wm/window_positioning_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_ -#define ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_ +#ifndef ASH_WM_WINDOW_POSITIONING_UTILS_H_ +#define ASH_WM_WINDOW_POSITIONING_UTILS_H_ #include "ash/ash_export.h" @@ -67,4 +67,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_ +#endif // ASH_WM_WINDOW_POSITIONING_UTILS_H_
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index f6f8e41a2..dc0ac72 100644 --- a/ash/wm/window_properties.cc +++ b/ash/wm/window_properties.cc
@@ -4,7 +4,7 @@ #include "ash/wm/window_properties.h" -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*); DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h index 561f18b..4733412 100644 --- a/ash/wm/window_properties.h +++ b/ash/wm/window_properties.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include "ash/ash_export.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" #include "ui/base/class_property.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/common/wm/window_resizer.cc b/ash/wm/window_resizer.cc similarity index 97% rename from ash/common/wm/window_resizer.cc rename to ash/wm/window_resizer.cc index bb96876..5aa2fd6 100644 --- a/ash/common/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/window_resizer.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/root_window_finder.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/root_window_finder.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h"
diff --git a/ash/common/wm/window_resizer.h b/ash/wm/window_resizer.h similarity index 94% rename from ash/common/wm/window_resizer.h rename to ash/wm/window_resizer.h index 1caf9338..d0d8d8b 100644 --- a/ash/common/wm/window_resizer.h +++ b/ash/wm/window_resizer.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_RESIZER_H_ -#define ASH_COMMON_WM_WINDOW_RESIZER_H_ +#ifndef ASH_WM_WINDOW_RESIZER_H_ +#define ASH_WM_WINDOW_RESIZER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/drag_details.h" -#include "ash/common/wm/window_state.h" +#include "ash/wm/drag_details.h" +#include "ash/wm/window_state.h" #include "base/macros.h" #include "ui/wm/public/window_move_client.h" @@ -107,4 +107,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_RESIZER_H_ +#endif // ASH_WM_WINDOW_RESIZER_H_
diff --git a/ash/common/wm/window_state.cc b/ash/wm/window_state.cc similarity index 97% rename from ash/common/wm/window_state.cc rename to ash/wm/window_state.cc index fbfa933..324c3111 100644 --- a/ash/common/wm/window_state.cc +++ b/ash/wm/window_state.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include <utility> -#include "ash/common/wm/default_state.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state_delegate.h" -#include "ash/common/wm/window_state_observer.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_window.h" +#include "ash/wm/default_state.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state_delegate.h" +#include "ash/wm/window_state_observer.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "base/auto_reset.h" namespace ash {
diff --git a/ash/common/wm/window_state.h b/ash/wm/window_state.h similarity index 98% rename from ash/common/wm/window_state.h rename to ash/wm/window_state.h index 53a5c15..37cf627 100644 --- a/ash/common/wm/window_state.h +++ b/ash/wm/window_state.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_STATE_H_ -#define ASH_COMMON_WM_WINDOW_STATE_H_ +#ifndef ASH_WM_WINDOW_STATE_H_ +#define ASH_WM_WINDOW_STATE_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/drag_details.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/drag_details.h" +#include "ash/wm/wm_types.h" #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/observer_list.h" @@ -394,4 +394,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_STATE_H_ +#endif // ASH_WM_WINDOW_STATE_H_
diff --git a/ash/wm/window_state_aura.cc b/ash/wm/window_state_aura.cc index c2ae3d6a..4e3d923 100644 --- a/ash/wm/window_state_aura.cc +++ b/ash/wm/window_state_aura.cc
@@ -4,9 +4,9 @@ #include "ash/wm/window_state_aura.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h"
diff --git a/ash/common/wm/window_state_delegate.cc b/ash/wm/window_state_delegate.cc similarity index 91% rename from ash/common/wm/window_state_delegate.cc rename to ash/wm/window_state_delegate.cc index 0c3fe59..5346b4b 100644 --- a/ash/common/wm/window_state_delegate.cc +++ b/ash/wm/window_state_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_state_delegate.h" +#include "ash/wm/window_state_delegate.h" namespace ash { namespace wm {
diff --git a/ash/common/wm/window_state_delegate.h b/ash/wm/window_state_delegate.h similarity index 89% rename from ash/common/wm/window_state_delegate.h rename to ash/wm/window_state_delegate.h index 11bd17f..7912efe 100644 --- a/ash/common/wm/window_state_delegate.h +++ b/ash/wm/window_state_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_ -#define ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_ +#ifndef ASH_WM_WINDOW_STATE_DELEGATE_H_ +#define ASH_WM_WINDOW_STATE_DELEGATE_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -37,4 +37,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_ +#endif // ASH_WM_WINDOW_STATE_DELEGATE_H_
diff --git a/ash/common/wm/window_state_observer.h b/ash/wm/window_state_observer.h similarity index 88% rename from ash/common/wm/window_state_observer.h rename to ash/wm/window_state_observer.h index 7bfec4e1..e18cb32 100644 --- a/ash/common/wm/window_state_observer.h +++ b/ash/wm/window_state_observer.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_ -#define ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_ +#ifndef ASH_WM_WINDOW_STATE_OBSERVER_H_ +#define ASH_WM_WINDOW_STATE_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_types.h" namespace ash { namespace wm { @@ -39,4 +39,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_ +#endif // ASH_WM_WINDOW_STATE_OBSERVER_H_
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc index b04883c..6168dbab 100644 --- a/ash/wm/window_state_unittest.cc +++ b/ash/wm/window_state_unittest.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include <utility> -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_util.h" -#include "ash/common/wm/wm_event.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/window_state_util.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/common/wm/window_state_util.cc b/ash/wm/window_state_util.cc similarity index 84% rename from ash/common/wm/window_state_util.cc rename to ash/wm/window_state_util.cc index cea13eb..f83de561 100644 --- a/ash/common/wm/window_state_util.cc +++ b/ash/wm/window_state_util.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_state_util.h" +#include "ash/wm/window_state_util.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_delegate.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_state.h" +#include "ash/wm/window_state_delegate.h" namespace ash { namespace wm {
diff --git a/ash/common/wm/window_state_util.h b/ash/wm/window_state_util.h similarity index 79% rename from ash/common/wm/window_state_util.h rename to ash/wm/window_state_util.h index 33bb590d..aa603de 100644 --- a/ash/common/wm/window_state_util.h +++ b/ash/wm/window_state_util.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WINDOW_STATE_UTIL_H_ -#define ASH_COMMON_WM_WINDOW_STATE_UTIL_H_ +#ifndef ASH_WM_WINDOW_STATE_UTIL_H_ +#define ASH_WM_WINDOW_STATE_UTIL_H_ #include "ash/ash_export.h" @@ -19,4 +19,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WINDOW_STATE_UTIL_H_ +#endif // ASH_WM_WINDOW_STATE_UTIL_H_
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index d4cf8ab..5d833c7a 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc
@@ -7,15 +7,15 @@ #include <vector> #include "ash/common/ash_constants.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h"
diff --git a/ash/wm/window_util_unittest.cc b/ash/wm/window_util_unittest.cc index 5811818..3be9969 100644 --- a/ash/wm/window_util_unittest.cc +++ b/ash/wm/window_util_unittest.cc
@@ -4,10 +4,10 @@ #include "ash/wm/window_util.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/display/manager/display_manager.h"
diff --git a/ash/common/wm/wm_event.cc b/ash/wm/wm_event.cc similarity index 92% rename from ash/common/wm/wm_event.cc rename to ash/wm/wm_event.cc index f4c03643..da5b77d 100644 --- a/ash/common/wm/wm_event.cc +++ b/ash/wm/wm_event.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/wm_event.h" +#include "ash/wm/wm_event.h" namespace ash { namespace wm {
diff --git a/ash/common/wm/wm_event.h b/ash/wm/wm_event.h similarity index 96% rename from ash/common/wm/wm_event.h rename to ash/wm/wm_event.h index e26ba78..c6b6f96 100644 --- a/ash/common/wm/wm_event.h +++ b/ash/wm/wm_event.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WM_EVENT_H_ -#define ASH_COMMON_WM_WM_EVENT_H_ +#ifndef ASH_WM_WM_EVENT_H_ +#define ASH_WM_WM_EVENT_H_ #include "ash/ash_export.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_types.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h" @@ -126,4 +126,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WM_EVENT_H_ +#endif // ASH_WM_WM_EVENT_H_
diff --git a/ash/common/wm/wm_screen_util.cc b/ash/wm/wm_screen_util.cc similarity index 96% rename from ash/common/wm/wm_screen_util.cc rename to ash/wm/wm_screen_util.cc index 768556a6..77ae246 100644 --- a/ash/common/wm/wm_screen_util.cc +++ b/ash/wm/wm_screen_util.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/wm_screen_util.h" +#include "ash/wm/wm_screen_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h"
diff --git a/ash/common/wm/wm_screen_util.h b/ash/wm/wm_screen_util.h similarity index 87% rename from ash/common/wm/wm_screen_util.h rename to ash/wm/wm_screen_util.h index dc18200..7d2c083 100644 --- a/ash/common/wm/wm_screen_util.h +++ b/ash/wm/wm_screen_util.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WM_SCREEN_UTIL_H_ -#define ASH_COMMON_WM_WM_SCREEN_UTIL_H_ +#ifndef ASH_WM_WM_SCREEN_UTIL_H_ +#define ASH_WM_WM_SCREEN_UTIL_H_ #include "ash/ash_export.h" @@ -30,4 +30,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WM_SCREEN_UTIL_H_ +#endif // ASH_WM_WM_SCREEN_UTIL_H_
diff --git a/ash/common/wm/wm_snap_to_pixel_layout_manager.cc b/ash/wm/wm_snap_to_pixel_layout_manager.cc similarity index 96% rename from ash/common/wm/wm_snap_to_pixel_layout_manager.cc rename to ash/wm/wm_snap_to_pixel_layout_manager.cc index 79afc89..740a099 100644 --- a/ash/common/wm/wm_snap_to_pixel_layout_manager.cc +++ b/ash/wm/wm_snap_to_pixel_layout_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/wm/wm_snap_to_pixel_layout_manager.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h"
diff --git a/ash/common/wm/wm_snap_to_pixel_layout_manager.h b/ash/wm/wm_snap_to_pixel_layout_manager.h similarity index 87% rename from ash/common/wm/wm_snap_to_pixel_layout_manager.h rename to ash/wm/wm_snap_to_pixel_layout_manager.h index 7cf38ca..da98f023 100644 --- a/ash/common/wm/wm_snap_to_pixel_layout_manager.h +++ b/ash/wm/wm_snap_to_pixel_layout_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ +#define ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" #include "ash/common/wm_layout_manager.h" @@ -40,4 +40,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ +#endif // ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
diff --git a/ash/common/wm/wm_toplevel_window_event_handler.cc b/ash/wm/wm_toplevel_window_event_handler.cc similarity index 98% rename from ash/common/wm/wm_toplevel_window_event_handler.cc rename to ash/wm/wm_toplevel_window_event_handler.cc index 5e670b9..6c4eac1 100644 --- a/ash/common/wm/wm_toplevel_window_event_handler.cc +++ b/ash/wm/wm_toplevel_window_event_handler.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/wm_toplevel_window_event_handler.h" +#include "ash/wm/wm_toplevel_window_event_handler.h" -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_observer.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/window_state.h" +#include "ash/wm/window_state_observer.h" +#include "ash/wm/wm_event.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/base/hit_test.h"
diff --git a/ash/common/wm/wm_toplevel_window_event_handler.h b/ash/wm/wm_toplevel_window_event_handler.h similarity index 94% rename from ash/common/wm/wm_toplevel_window_event_handler.h rename to ash/wm/wm_toplevel_window_event_handler.h index 161b627..0327b5f 100644 --- a/ash/common/wm/wm_toplevel_window_event_handler.h +++ b/ash/wm/wm_toplevel_window_event_handler.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ -#define ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ +#ifndef ASH_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ +#define ASH_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/wm_types.h" #include "ash/common/wm_display_observer.h" +#include "ash/wm/wm_types.h" #include "base/callback.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h" @@ -125,4 +125,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ +#endif // ASH_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
diff --git a/ash/common/wm/wm_types.cc b/ash/wm/wm_types.cc similarity index 97% rename from ash/common/wm/wm_types.cc rename to ash/wm/wm_types.cc index 4deed1a..1466775 100644 --- a/ash/common/wm/wm_types.cc +++ b/ash/wm/wm_types.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_types.h" #include "base/logging.h"
diff --git a/ash/common/wm/wm_types.h b/ash/wm/wm_types.h similarity index 95% rename from ash/common/wm/wm_types.h rename to ash/wm/wm_types.h index ad886d8c..d237f39 100644 --- a/ash/common/wm/wm_types.h +++ b/ash/wm/wm_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WM_TYPES_H_ -#define ASH_COMMON_WM_WM_TYPES_H_ +#ifndef ASH_WM_WM_TYPES_H_ +#define ASH_WM_WM_TYPES_H_ #include "ash/ash_export.h" #include "ui/base/ui_base_types.h" @@ -63,4 +63,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WM_TYPES_H_ +#endif // ASH_WM_WM_TYPES_H_
diff --git a/ash/common/wm/wm_window_animations.cc b/ash/wm/wm_window_animations.cc similarity index 94% rename from ash/common/wm/wm_window_animations.cc rename to ash/wm/wm_window_animations.cc index 64b431f..e21cc70a 100644 --- a/ash/common/wm/wm_window_animations.cc +++ b/ash/wm/wm_window_animations.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/wm_window_animations.h" +#include "ash/wm/wm_window_animations.h" #include "ui/compositor/layer.h" #include "ui/gfx/transform.h"
diff --git a/ash/common/wm/wm_window_animations.h b/ash/wm/wm_window_animations.h similarity index 84% rename from ash/common/wm/wm_window_animations.h rename to ash/wm/wm_window_animations.h index d704304..860e51e 100644 --- a/ash/common/wm/wm_window_animations.h +++ b/ash/wm/wm_window_animations.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WM_WINDOW_ANIMATIONS_H_ -#define ASH_COMMON_WM_WM_WINDOW_ANIMATIONS_H_ +#ifndef ASH_WM_WM_WINDOW_ANIMATIONS_H_ +#define ASH_WM_WM_WINDOW_ANIMATIONS_H_ #include "ash/ash_export.h" @@ -29,4 +29,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WM_WINDOW_ANIMATIONS_H_ +#endif // ASH_WM_WM_WINDOW_ANIMATIONS_H_
diff --git a/ash/common/wm/workspace/magnetism_matcher.cc b/ash/wm/workspace/magnetism_matcher.cc similarity index 98% rename from ash/common/wm/workspace/magnetism_matcher.cc rename to ash/wm/workspace/magnetism_matcher.cc index e428d96..d7870ff 100644 --- a/ash/common/wm/workspace/magnetism_matcher.cc +++ b/ash/wm/workspace/magnetism_matcher.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/magnetism_matcher.h" +#include "ash/wm/workspace/magnetism_matcher.h" #include <algorithm> #include <cmath>
diff --git a/ash/common/wm/workspace/magnetism_matcher.h b/ash/wm/workspace/magnetism_matcher.h similarity index 97% rename from ash/common/wm/workspace/magnetism_matcher.h rename to ash/wm/workspace/magnetism_matcher.h index 034f9c3..ef8a18d 100644 --- a/ash/common/wm/workspace/magnetism_matcher.h +++ b/ash/wm/workspace/magnetism_matcher.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_ -#define ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_ +#ifndef ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_ +#define ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_ #include <stdint.h> @@ -189,4 +189,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_ +#endif // ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
diff --git a/ash/wm/workspace/magnetism_matcher_unittest.cc b/ash/wm/workspace/magnetism_matcher_unittest.cc index c9c1c12b..e3124e3 100644 --- a/ash/wm/workspace/magnetism_matcher_unittest.cc +++ b/ash/wm/workspace/magnetism_matcher_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/magnetism_matcher.h" +#include "ash/wm/workspace/magnetism_matcher.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/common/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc similarity index 99% rename from ash/common/wm/workspace/multi_window_resize_controller.cc rename to ash/wm/workspace/multi_window_resize_controller.cc index 48879e8..6e026131 100644 --- a/ash/common/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/multi_window_resize_controller.h" +#include "ash/wm/workspace/multi_window_resize_controller.h" -#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/common/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h similarity index 96% rename from ash/common/wm/workspace/multi_window_resize_controller.h rename to ash/wm/workspace/multi_window_resize_controller.h index 48bd35a6..e7609bc 100644 --- a/ash/common/wm/workspace/multi_window_resize_controller.h +++ b/ash/wm/workspace/multi_window_resize_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ -#define ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ +#ifndef ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ +#define ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ #include <memory> #include <vector> @@ -177,4 +177,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ +#endif // ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc index 6fd0a13..0df8682 100644 --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc +++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
@@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/multi_window_resize_controller.h" +#include "ash/wm/workspace/multi_window_resize_controller.h" #include "ash/common/ash_constants.h" -#include "ash/common/frame/custom_frame_view_ash.h" -#include "ash/common/test/workspace_event_handler_test_helper.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_window.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" +#include "ash/test/workspace_event_handler_test_helper.h" #include "ash/wm/window_util.h" +#include "ash/wm/workspace_controller.h" #include "ash/wm/workspace_controller_test_helper.h" #include "base/stl_util.h" #include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/common/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc similarity index 97% rename from ash/common/wm/workspace/phantom_window_controller.cc rename to ash/wm/workspace/phantom_window_controller.cc index af75b3c..5cb8b4d 100644 --- a/ash/common/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/phantom_window_controller.h" +#include "ash/wm/workspace/phantom_window_controller.h" #include <math.h> -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" +#include "ash/wm/root_window_finder.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/background.h"
diff --git a/ash/common/wm/workspace/phantom_window_controller.h b/ash/wm/workspace/phantom_window_controller.h similarity index 88% rename from ash/common/wm/workspace/phantom_window_controller.h rename to ash/wm/workspace/phantom_window_controller.h index 6ac7da2..4a43aba 100644 --- a/ash/common/wm/workspace/phantom_window_controller.h +++ b/ash/wm/workspace/phantom_window_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ -#define ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ +#ifndef ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ +#define ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ #include <memory> @@ -54,4 +54,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ +#endif // ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
diff --git a/ash/common/wm/workspace/two_step_edge_cycler.cc b/ash/wm/workspace/two_step_edge_cycler.cc similarity index 96% rename from ash/common/wm/workspace/two_step_edge_cycler.cc rename to ash/wm/workspace/two_step_edge_cycler.cc index 9e87de9..f8485e01 100644 --- a/ash/common/wm/workspace/two_step_edge_cycler.cc +++ b/ash/wm/workspace/two_step_edge_cycler.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/two_step_edge_cycler.h" +#include "ash/wm/workspace/two_step_edge_cycler.h" #include <cstdlib>
diff --git a/ash/common/wm/workspace/two_step_edge_cycler.h b/ash/wm/workspace/two_step_edge_cycler.h similarity index 90% rename from ash/common/wm/workspace/two_step_edge_cycler.h rename to ash/wm/workspace/two_step_edge_cycler.h index 64743eb1..d6aca87ee 100644 --- a/ash/common/wm/workspace/two_step_edge_cycler.h +++ b/ash/wm/workspace/two_step_edge_cycler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ -#define ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ +#ifndef ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ +#define ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -58,4 +58,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ +#endif // ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
diff --git a/ash/common/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc similarity index 96% rename from ash/common/wm/workspace/workspace_event_handler.cc rename to ash/wm/workspace/workspace_event_handler.cc index 0e26b16..e5e96cb0 100644 --- a/ash/common/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_event_handler.h" +#include "ash/wm/workspace/workspace_event_handler.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" #include "ui/base/hit_test.h" #include "ui/events/event.h"
diff --git a/ash/common/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h similarity index 88% rename from ash/common/wm/workspace/workspace_event_handler.h rename to ash/wm/workspace/workspace_event_handler.h index eca5650..d400eeb 100644 --- a/ash/common/wm/workspace/workspace_event_handler.h +++ b/ash/wm/workspace/workspace_event_handler.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ -#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ +#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ +#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ #include "ash/ash_export.h" -#include "ash/common/wm/workspace/multi_window_resize_controller.h" +#include "ash/wm/workspace/multi_window_resize_controller.h" #include "base/macros.h" namespace ui { @@ -58,4 +58,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ +#endif // ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
diff --git a/ash/wm/workspace/workspace_event_handler_aura.h b/ash/wm/workspace/workspace_event_handler_aura.h index a8e084d..28fcae58 100644 --- a/ash/wm/workspace/workspace_event_handler_aura.h +++ b/ash/wm/workspace/workspace_event_handler_aura.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_AURA_H_ #define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_AURA_H_ -#include "ash/common/wm/workspace/workspace_event_handler.h" +#include "ash/wm/workspace/workspace_event_handler.h" #include "base/macros.h" #include "ui/events/event_handler.h"
diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index 249c9c3c..17fc85c 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_event_handler.h" +#include "ash/wm/workspace/workspace_event_handler.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace_controller.h" #include "ash/wm/workspace_controller_test_helper.h" #include "base/threading/thread_task_runner_handle.h" #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/common/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc similarity index 96% rename from ash/common/wm/workspace/workspace_layout_manager.cc rename to ash/wm/workspace/workspace_layout_manager.cc index 055ff85..ebfec663 100644 --- a/ash/common/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -2,25 +2,25 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_layout_manager.h" +#include "ash/wm/workspace/workspace_layout_manager.h" #include <algorithm> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/always_on_top_controller.h" -#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" -#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/always_on_top_controller.h" +#include "ash/wm/fullscreen_window_finder.h" +#include "ash/wm/window_positioner.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" +#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/base/ui_base_switches.h"
diff --git a/ash/common/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h similarity index 94% rename from ash/common/wm/workspace/workspace_layout_manager.h rename to ash/wm/workspace/workspace_layout_manager.h index 85413a71..e9410937 100644 --- a/ash/common/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ -#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ +#define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ #include <memory> #include <set> #include "ash/ash_export.h" #include "ash/common/shell_observer.h" -#include "ash/common/wm/window_state_observer.h" -#include "ash/common/wm/wm_types.h" #include "ash/common/wm_activation_observer.h" #include "ash/common/wm_layout_manager.h" +#include "ash/wm/window_state_observer.h" +#include "ash/wm/wm_types.h" #include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/display/display_observer.h" @@ -138,4 +138,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ +#endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
diff --git a/ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h b/ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h similarity index 82% rename from ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h rename to ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h index ec4fe68..ed20222 100644 --- a/ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h +++ b/ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ -#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ +#ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ +#define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ #include "ash/ash_export.h" -#include "ash/common/wm/wm_types.h" +#include "ash/wm/wm_types.h" namespace ash { @@ -45,4 +45,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ +#endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
diff --git a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc index d19b6718..d36493cc 100644 --- a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
@@ -2,28 +2,28 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_layout_manager.h" +#include "ash/wm/workspace/workspace_layout_manager.h" #include <string> #include <utility> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_observer.h" -#include "ash/common/test/ash_test.h" -#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" -#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/test/ash_test.h" +#include "ash/wm/fullscreen_window_finder.h" +#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include "base/command_line.h" #include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_types.h"
diff --git a/ash/common/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc similarity index 98% rename from ash/common/wm/workspace/workspace_layout_manager_unittest.cc rename to ash/wm/workspace/workspace_layout_manager_unittest.cc index 5ca89034..5035364 100644 --- a/ash/common/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -2,29 +2,29 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_layout_manager.h" +#include "ash/wm/workspace/workspace_layout_manager.h" #include <string> #include <utility> #include "ash/common/session/session_state_delegate.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/shell_observer.h" -#include "ash/common/test/ash_test.h" -#include "ash/common/test/test_session_state_delegate.h" -#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" -#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/test/ash_test.h" +#include "ash/test/test_session_state_delegate.h" +#include "ash/wm/fullscreen_window_finder.h" +#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include "base/command_line.h" #include "base/run_loop.h" #include "ui/aura/env.h"
diff --git a/ash/common/wm/workspace/workspace_types.h b/ash/wm/workspace/workspace_types.h similarity index 80% rename from ash/common/wm/workspace/workspace_types.h rename to ash/wm/workspace/workspace_types.h index b51eabcc..c6b7f1b6 100644 --- a/ash/common/wm/workspace/workspace_types.h +++ b/ash/wm/workspace/workspace_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_ -#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_ +#ifndef ASH_WM_WORKSPACE_WORKSPACE_TYPES_H_ +#define ASH_WM_WORKSPACE_WORKSPACE_TYPES_H_ namespace ash { namespace wm { @@ -26,4 +26,4 @@ } // namespace wm } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_ +#endif // ASH_WM_WORKSPACE_WORKSPACE_TYPES_H_
diff --git a/ash/common/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc similarity index 98% rename from ash/common/wm/workspace/workspace_window_resizer.cc rename to ash/wm/workspace/workspace_window_resizer.cc index 5f66ec57..208b400 100644 --- a/ash/common/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_window_resizer.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include <algorithm> #include <cmath> @@ -10,22 +10,22 @@ #include <vector> #include "ash/common/ash_switches.h" -#include "ash/common/metrics/user_metrics_action.h" -#include "ash/common/wm/default_window_resizer.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/dock/docked_window_resizer.h" -#include "ash/common/wm/panels/panel_window_resizer.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/wm_screen_util.h" -#include "ash/common/wm/workspace/phantom_window_controller.h" -#include "ash/common/wm/workspace/two_step_edge_cycler.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/metrics/user_metrics_action.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" #include "ash/shell.h" +#include "ash/wm/default_window_resizer.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/dock/docked_window_resizer.h" +#include "ash/wm/panels/panel_window_resizer.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/wm_screen_util.h" +#include "ash/wm/workspace/phantom_window_controller.h" +#include "ash/wm/workspace/two_step_edge_cycler.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "ui/base/hit_test.h"
diff --git a/ash/common/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h similarity index 96% rename from ash/common/wm/workspace/workspace_window_resizer.h rename to ash/wm/workspace/workspace_window_resizer.h index 03b027d..13edf62 100644 --- a/ash/common/wm/workspace/workspace_window_resizer.h +++ b/ash/wm/workspace/workspace_window_resizer.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ -#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ +#ifndef ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ +#define ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ #include <stdint.h> #include <memory> #include <vector> -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/workspace/magnetism_matcher.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/workspace/magnetism_matcher.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" @@ -227,4 +227,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ +#endif // ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index 8979daa14..992bf67c 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -2,24 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace/workspace_window_resizer.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include "ash/common/ash_switches.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace/phantom_window_controller.h" -#include "ash/common/wm/workspace_controller.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/screen_util.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace/phantom_window_controller.h" +#include "ash/wm/workspace_controller.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/ash/common/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc similarity index 90% rename from ash/common/wm/workspace_controller.cc rename to ash/wm/workspace_controller.cc index 09f742b..feb3e61b 100644 --- a/ash/common/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc
@@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace_controller.h" +#include "ash/wm/workspace_controller.h" #include <utility> -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/dock/docked_window_layout_manager.h" -#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_window_animations.h" -#include "ash/common/wm/workspace/workspace_event_handler.h" -#include "ash/common/wm/workspace/workspace_layout_manager.h" -#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/dock/docked_window_layout_manager.h" +#include "ash/wm/fullscreen_window_finder.h" +#include "ash/wm/window_state.h" +#include "ash/wm/wm_window_animations.h" +#include "ash/wm/workspace/workspace_event_handler.h" +#include "ash/wm/workspace/workspace_layout_manager.h" +#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "base/memory/ptr_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/common/wm/workspace_controller.h b/ash/wm/workspace_controller.h similarity index 88% rename from ash/common/wm/workspace_controller.h rename to ash/wm/workspace_controller.h index d37fe68..22bf5bb 100644 --- a/ash/common/wm/workspace_controller.h +++ b/ash/wm/workspace_controller.h
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_COMMON_WM_WORKSPACE_CONTROLLER_H_ -#define ASH_COMMON_WM_WORKSPACE_CONTROLLER_H_ +#ifndef ASH_WM_WORKSPACE_CONTROLLER_H_ +#define ASH_WM_WORKSPACE_CONTROLLER_H_ #include <memory> #include "ash/ash_export.h" -#include "ash/common/wm/workspace/workspace_types.h" +#include "ash/wm/workspace/workspace_types.h" #include "base/macros.h" #include "ui/aura/window_observer.h" @@ -57,4 +57,4 @@ } // namespace ash -#endif // ASH_COMMON_WM_WORKSPACE_CONTROLLER_H_ +#endif // ASH_WM_WORKSPACE_CONTROLLER_H_
diff --git a/ash/wm/workspace_controller_test_helper.cc b/ash/wm/workspace_controller_test_helper.cc index 5ecb0d0..a0c704f8 100644 --- a/ash/wm/workspace_controller_test_helper.cc +++ b/ash/wm/workspace_controller_test_helper.cc
@@ -4,8 +4,8 @@ #include "ash/wm/workspace_controller_test_helper.h" -#include "ash/common/test/workspace_event_handler_test_helper.h" -#include "ash/common/wm/workspace_controller.h" +#include "ash/test/workspace_event_handler_test_helper.h" +#include "ash/wm/workspace_controller.h" #include "ui/aura/window.h" namespace ash {
diff --git a/ash/wm/workspace_controller_test_helper.h b/ash/wm/workspace_controller_test_helper.h index f5d6e6a..a5aeb44 100644 --- a/ash/wm/workspace_controller_test_helper.h +++ b/ash/wm/workspace_controller_test_helper.h
@@ -5,7 +5,7 @@ #ifndef ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_ #define ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_ -#include "ash/common/wm/workspace_controller.h" +#include "ash/wm/workspace_controller.h" #include "base/macros.h" namespace ash {
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 669a5b8..50c4c4c12 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc
@@ -2,29 +2,29 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/workspace_controller.h" +#include "ash/wm/workspace_controller.h" #include <map> #include "ash/common/session/session_controller.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/test/test_shelf_delegate.h" -#include "ash/common/wm/panels/panel_layout_manager.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" -#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/screen_util.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" +#include "ash/test/test_shelf_delegate.h" +#include "ash/wm/panels/panel_layout_manager.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" +#include "ash/wm/workspace/workspace_window_resizer.h" #include "base/strings/string_number_conversions.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/test_window_delegate.h"
diff --git a/chrome/VERSION b/chrome/VERSION index 31ec48a2..f5db663ae 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=59 MINOR=0 -BUILD=3031 +BUILD=3032 PATCH=0
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 23b1832..198fc23 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -13,12 +13,12 @@ #include "ash/autoclick/autoclick_controller.h" #include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h" #include "ash/common/ash_constants.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/high_contrast/high_contrast_controller.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "base/callback.h"
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc index abfc07aa..5a008416 100644 --- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc +++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -3,11 +3,11 @@ // found in the LICENSE file. #include "ash/common/accessibility_types.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index 50de62e..fea2d160 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
@@ -4,8 +4,8 @@ #include <queue> -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_table.h" #include "ash/common/accessibility_types.h" #include "ash/common/wm_shell.h" #include "ash/shell.h"
diff --git a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc index 4e8a5eba..342d4ba 100644 --- a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc +++ b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.h" -#include "ash/common/shelf/shelf_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_delegate.h" #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc index f82e67c..5d8b8603 100644 --- a/chrome/browser/chromeos/arc/arc_session_manager.cc +++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "ash/common/shelf/shelf_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_delegate.h" #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc index 78010610..765df3e 100644 --- a/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc +++ b/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/window_animation_types.h" #include "ash/shell.h" +#include "ash/wm/window_animation_types.h" #include "ash/wm/window_animations.h" #include "base/command_line.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc index 5ab6c10c..cf01c24 100644 --- a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc +++ b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h" -#include "ash/common/wm/screen_dimmer.h" #include "ash/shell.h" +#include "ash/wm/screen_dimmer.h" #include "base/memory/ptr_util.h" #include "ui/base/user_activity/user_activity_detector.h" #include "ui/display/manager/chromeos/display_configurator.h"
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc index d9b080d..f28681f 100644 --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -10,7 +10,6 @@ #include <utility> #include <vector> -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/display/display_util.h" #include "ash/display/json_converter.h" @@ -19,6 +18,7 @@ #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc index 5a68721..62431c3 100644 --- a/chrome/browser/chromeos/events/event_rewriter.cc +++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "ash/common/wm/window_state.h" #include "ash/sticky_keys/sticky_keys_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc index da755cd..d7a2ff2 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -6,11 +6,11 @@ #include <vector> -#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/sticky_keys/sticky_keys_overlay.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index c9eac15..fbf1e9d 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -11,11 +11,11 @@ #include <utility> #include <vector> -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/shell.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 0d2eec4e..a7014fc 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "ash/common/wm/window_state.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc index e232d32..53e59d9 100644 --- a/chrome/browser/chromeos/first_run/steps/tray_step.cc +++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/first_run/steps/tray_step.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/first_run/first_run_helper.h" +#include "ash/shelf/wm_shelf.h" #include "base/i18n/rtl.h" #include "chrome/browser/chromeos/first_run/step_names.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc index 9e6b0fc..198e31b 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -8,13 +8,13 @@ #include <vector> #include "ash/common/wallpaper/wallpaper_controller.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/wm/lock_state_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/bind.h" #include "base/command_line.h" #include "base/lazy_instance.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc index cb42e44b..193c616 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h index 7f5f64d..2e7bfdf 100644 --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -11,7 +11,7 @@ #include <string> #include "ash/common/shell_observer.h" -#include "ash/common/wm/lock_state_observer.h" +#include "ash/wm/lock_state_observer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index 367ed8e..ab912aa 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc index 924ed4a..6ea96f65 100644 --- a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc +++ b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "ash/common/wm/window_positioner.h" #include "ash/shell.h" +#include "ash/wm/window_positioner.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc index c9a5ddf..098c45a 100644 --- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc +++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/root_window_controller.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index 3c1eb01d..580144f 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -4,12 +4,12 @@ #include "ash/common/accessibility_types.h" #include "ash/common/login_status.h" -#include "ash/common/test/test_session_state_delegate.h" #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray_accessibility.h" #include "ash/test/shell_test_api.h" +#include "ash/test/test_session_state_delegate.h" #include "base/callback.h" #include "base/command_line.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc index b498453..c4fa962b6 100644 --- a/chrome/browser/extensions/api/automation/automation_apitest.cc +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -33,7 +33,7 @@ #include "ui/accessibility/tree_generator.h" #if defined(OS_CHROMEOS) -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_shell.h" #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" #endif
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc index 7a73d7867..d1a8dbbe 100644 --- a/chrome/browser/extensions/bookmark_app_helper.cc +++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -76,8 +76,8 @@ #endif // defined(OS_WIN) #if defined(USE_ASH) -#include "ash/common/shelf/shelf_delegate.h" // nogncheck #include "ash/common/wm_shell.h" // nogncheck +#include "ash/shelf/shelf_delegate.h" // nogncheck #endif namespace {
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc index f744840..3c797009 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -6,11 +6,11 @@ #include <stdint.h> -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc index 900dccd0e..fec16ba9 100644 --- a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc +++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/global_shortcut_listener_chromeos.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_shell.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc index 2804fe5..a45e4ea9 100644 --- a/chrome/browser/notifications/fullscreen_notification_blocker.cc +++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc
@@ -13,10 +13,10 @@ #include "ui/message_center/notifier_settings.h" #if defined(USE_ASH) -#include "ash/common/wm/window_state.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/system_notifier.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index cf6f84c3..a3b281c 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc
@@ -195,8 +195,8 @@ #include "url/origin.h" #if defined(OS_CHROMEOS) -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_table.h" #include "ash/common/accessibility_types.h" #include "ash/common/wm_shell.h" #include "ash/shell.h"
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc index 5b90605..e66f6ae 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -41,7 +41,7 @@ #include "printing/features/features.h" #if defined(USE_ASH) -#include "ash/common/shelf/shelf_constants.h" // nogncheck +#include "ash/shelf/shelf_constants.h" // nogncheck #endif #if BUILDFLAG(ENABLE_PRINTING)
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc index 40d7547..079059c 100644 --- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_commands.h" +#include "ash/accelerators/accelerator_commands.h" #include "ash/accelerators/accelerator_commands_aura.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc index f381e1b..9c94c65d 100644 --- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "build/build_config.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc index c83d8d0..b13fc15 100644 --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" -#include "ash/common/shelf/shelf_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_delegate.h" #include "ash/shell.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc index a4386b1f..0e97237 100644 --- a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc +++ b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
@@ -4,12 +4,12 @@ #include <memory> -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "base/run_loop.h" #include "chrome/test/base/in_process_browser_test.h" #include "ui/app_list/presenter/app_list.h"
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc index b29a791..fe09e3ae 100644 --- a/chrome/browser/ui/ash/ash_init.cc +++ b/chrome/browser/ui/ash/ash_init.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/ash/ash_init.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_controller_delegate_aura.h" -#include "ash/common/accelerators/accelerator_controller.h" #include "ash/common/accessibility_types.h" #include "ash/common/wm_shell.h" #include "ash/high_contrast/high_contrast_controller.h"
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc index 591c9d55..059b59e 100644 --- a/chrome/browser/ui/ash/ash_util.cc +++ b/chrome/browser/ui/ash/ash_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/ash_util.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/mojo_interface_factory.h" #include "ash/common/wm_shell.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc b/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc index 465c770..a152f96 100644 --- a/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc +++ b/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h" -#include "ash/common/accelerators/accelerator_controller.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/bind.h"
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 42db34a..7f5914c9cc 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -13,12 +13,12 @@ #include "ash/common/accessibility_delegate.h" #include "ash/common/accessibility_types.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/content/gpu_support_impl.h" #include "ash/shell.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc index ffe1363..8b0fe5c 100644 --- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_delegate.h" #include "ash/wm/window_util.h" #include "base/macros.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc index f20d0993..586c3a95 100644 --- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
@@ -5,15 +5,15 @@ #include <string> -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/display/screen_orientation_controller_chromeos.h" #include "ash/shared/app_types.h" +#include "ash/shelf/shelf_delegate.h" #include "ash/shell.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/bind.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc index 294f9df6..36fdb8a 100644 --- a/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc index dc3ddfd..cd6e7b79 100644 --- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -7,12 +7,12 @@ #include <limits> #include <vector> -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_model.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shelf_application_menu_item.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_model.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc index 4c7e7c2b..8859cd4 100644 --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_types.h" #include "ash/shell.h" #include "ash/wm/window_util.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h index fb29db9..a206459 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_item_types.h" #include "ash/public/cpp/shelf_application_menu_item.h" #include "ash/public/interfaces/shelf.mojom.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_types.h" #include "chrome/browser/ui/app_icon_loader.h" #include "chrome/browser/ui/app_icon_loader_delegate.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc index ec8e4ab85..a3e2171 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -9,12 +9,12 @@ #include <vector> #include "ash/common/multi_profile_uma.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/resources/grit/ash_resources.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/tray/system_tray_delegate.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h index 037a222..9ad76028 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -8,10 +8,10 @@ #include <list> #include <memory> -#include "ash/common/shelf/shelf_delegate.h" -#include "ash/common/shelf/shelf_model_observer.h" #include "ash/display/window_tree_host_manager.h" #include "ash/public/cpp/shelf_types.h" +#include "ash/shelf/shelf_delegate.h" +#include "ash/shelf/shelf_model_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc index 7a473e0..bae868fc0 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -6,20 +6,20 @@ #include <stddef.h> -#include "ash/common/shelf/app_list_button.h" -#include "ash/common/shelf/shelf_button.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" +#include "ash/shelf/app_list_button.h" +#include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/shelf_view_test_api.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc index 4b5b8ad5..2e35e27 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -14,18 +14,18 @@ #include <utility> #include <vector> -#include "ash/common/shelf/shelf_application_menu_model.h" -#include "ash/common/shelf/shelf_constants.h" -#include "ash/common/shelf/shelf_controller.h" -#include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/shelf_model_observer.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/display/screen_orientation_controller_chromeos.h" +#include "ash/shelf/shelf_application_menu_model.h" +#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_controller.h" +#include "ash/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/shelf_model_observer.h" #include "ash/shell.h" #include "ash/test/ash_test_helper.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_util.h" #include "base/command_line.h" #include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc index dd059dc..61e577bb 100644 --- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h" -#include "ash/common/shelf/shelf_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_delegate.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" #include "base/stl_util.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc index e885823a..25b6ace3 100644 --- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h" -#include "ash/common/wm/window_state.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc index 7dc7522..ec28364 100644 --- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h" -#include "ash/common/shelf/shelf_item_delegate.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/shelf_item_delegate.h" #include "base/bind.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc index 30d381525..42c6bef 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -6,11 +6,11 @@ #include <string> -#include "ash/common/shelf/shelf_model.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wallpaper/wallpaper_delegate.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_model.h" +#include "ash/shelf/wm_shelf.h" #include "ash/strings/grit/ash_strings.h" #include "build/build_config.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h index e913717d..6ae3e77 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ -#include "ash/common/shelf/shelf_alignment_menu.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_alignment_menu.h" +#include "ash/shelf/shelf_item_types.h" #include "base/gtest_prod_util.h" #include "base/macros.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc index 7868df6..f9d27c9 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "ash/common/shelf/shelf_item_types.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_item_types.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc index 8894ff3..974fa1b 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h" -#include "ash/common/shelf/shelf_constants.h" +#include "ash/shelf/shelf_constants.h" #include "base/bind.h" #include "base/logging.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc index 2606e66d..a4f999a7 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "ash/common/shelf/shelf_constants.h" +#include "ash/shelf/shelf_constants.h" #include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h index 5c1c538..1ce11f7b 100644 --- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h +++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -7,8 +7,8 @@ #include <string> -#include "ash/common/shelf/shelf_item_delegate.h" -#include "ash/common/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_item_delegate.h" +#include "ash/shelf/shelf_item_types.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/events/event.h"
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc index 30e3df69..4dd7f76 100644 --- a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc +++ b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h" -#include "ash/common/shelf/shelf_item_types.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/window_properties.h" +#include "ash/shelf/shelf_item_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/launcher/settings_window_observer.cc b/chrome/browser/ui/ash/launcher/settings_window_observer.cc index f07ebd2..1ae904e 100644 --- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc +++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/ash/launcher/settings_window_observer.h" -#include "ash/common/shelf/shelf_item_types.h" #include "ash/public/cpp/window_properties.h" #include "ash/resources/grit/ash_resources.h" +#include "ash/shelf/shelf_item_types.h" #include "base/feature_list.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc index 79ec452..eae23e6 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -6,12 +6,12 @@ #include "ash/common/media_controller.h" #include "ash/common/multi_profile_uma.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/auto_reset.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index 103ea8b..542ac6b 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -4,24 +4,24 @@ #include <stddef.h> -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/content/shell_content_state.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/ash_test_environment_content.h" #include "ash/test/ash_test_helper.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "ash/wm/maximize_mode/maximize_mode_window_manager.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" +#include "ash/wm/wm_event.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc index 1d5ba25..a11acf62 100644 --- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
@@ -4,17 +4,17 @@ #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/shelf_widget.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wallpaper/wallpaper_delegate.h" -#include "ash/common/wm/mru_window_tracker.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" +#include "ash/wm/mru_window_tracker.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util.cc b/chrome/browser/ui/ash/multi_user/user_switch_util.cc index e0e7500f..81d62d8 100644 --- a/chrome/browser/ui/ash/multi_user/user_switch_util.cc +++ b/chrome/browser/ui/ash/multi_user/user_switch_util.cc
@@ -4,12 +4,12 @@ #include "chrome/browser/ui/ash/multi_user/user_switch_util.h" -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/screen_security/screen_tray_item.h" #include "ash/system/tray/system_tray.h" +#include "ash/wm/overview/window_selector_controller.h" #include "chrome/browser/ui/simple_message_box.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc index 4717298a..e7e825b 100644 --- a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/overview/window_selector_controller.h" #include "ash/common/wm_shell.h" #include "ash/system/screen_security/screen_tray_item.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/overview/window_selector_controller.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc index f39d951..1c12f73 100644 --- a/chrome/browser/ui/ash/shelf_browsertest.cc +++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_layout_manager.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/wm_shelf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc index a71dd18..c758b6c 100644 --- a/chrome/browser/ui/ash/window_positioner_unittest.cc +++ b/chrome/browser/ui/ash/window_positioner_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioner.h" +#include "ash/wm/window_positioner.h" #include <utility> -#include "ash/common/wm/window_resizer.h" #include "ash/common/wm_shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_resizer.h" #include "base/logging.h" #include "base/macros.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc index 1cd8dbb..52b6cb7 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -46,7 +46,7 @@ #endif #if defined(USE_ASH) -#include "ash/common/accelerators/accelerator_table.h" // nogncheck +#include "ash/accelerators/accelerator_table.h" // nogncheck #endif // defined(USE_ASH) namespace {
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index 43a54894..b539183 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -14,7 +14,7 @@ #include "ui/events/event_constants.h" #if defined(USE_ASH) -#include "ash/common/accelerators/accelerator_table.h" // nogncheck +#include "ash/accelerators/accelerator_table.h" // nogncheck #endif namespace {
diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index 6b05bc2..31bf6e49 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
@@ -12,7 +12,7 @@ #include "ui/events/event_constants.h" #if defined(USE_ASH) -#include "ash/common/accelerators/accelerator_table.h" +#include "ash/accelerators/accelerator_table.h" #endif // USE_ASH namespace chrome {
diff --git a/chrome/browser/ui/views/accelerator_utils_aura.cc b/chrome/browser/ui/views/accelerator_utils_aura.cc index 55093f8..8c6414c9 100644 --- a/chrome/browser/ui/views/accelerator_utils_aura.cc +++ b/chrome/browser/ui/views/accelerator_utils_aura.cc
@@ -9,7 +9,7 @@ #include "ui/base/accelerators/accelerator.h" #if defined(USE_ASH) -#include "ash/common/accelerators/accelerator_table.h" // nogncheck +#include "ash/accelerators/accelerator_table.h" // nogncheck #endif // USE_ASH namespace chrome {
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc index 2a1b343..ca1e73f3 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
@@ -21,8 +21,8 @@ #include "ui/views/widget/widget.h" #if defined(USE_ASH) -#include "ash/common/shelf/shelf_delegate.h" // nogncheck #include "ash/common/wm_shell.h" // nogncheck +#include "ash/shelf/shelf_delegate.h" // nogncheck #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" // nogncheck #endif
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc index 8ba36e52..78abdfe 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -7,20 +7,20 @@ #include "apps/ui/views/app_window_frame_view.h" #include "ash/common/ash_constants.h" #include "ash/common/ash_switches.h" -#include "ash/common/frame/custom_frame_view_ash.h" -#include "ash/common/shelf/shelf_item_types.h" -#include "ash/common/wm/panels/panel_frame_view.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_delegate.h" -#include "ash/common/wm/window_state_observer.h" #include "ash/common/wm_window.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/shared/app_types.h" #include "ash/shared/immersive_fullscreen_controller.h" +#include "ash/shelf/shelf_item_types.h" #include "ash/shell.h" +#include "ash/wm/panels/panel_frame_view.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/window_state_delegate.h" +#include "ash/wm/window_state_observer.h" #include "chrome/browser/chromeos/note_taking_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc index acf1470a..1db6f37e 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/chrome_views_delegate.h" -#include "ash/common/accelerators/accelerator_controller.h" -#include "ash/common/wm/window_state.h" +#include "ash/accelerators/accelerator_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/bind.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc index d40bb822..3d73ee2 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -5,11 +5,11 @@ #include "chrome/browser/ui/views/frame/browser_frame_ash.h" #include "ash/common/ash_switches.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/window_state_delegate.h" #include "ash/shell.h" #include "ash/wm/window_properties.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/window_state_delegate.h" #include "ash/wm/window_util.h" #include "base/macros.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc index ba9f1f3..3142cbd6 100644 --- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc +++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/header_painter_util.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/header_painter_util.h" #include "ash/resources/vector_icons/vector_icons.h" #include "base/logging.h" // DCHECK #include "chrome/browser/themes/theme_properties.h"
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.h b/chrome/browser/ui/views/frame/browser_header_painter_ash.h index f6e6c41..96fedaf0 100644 --- a/chrome/browser/ui/views/frame/browser_header_painter_ash.h +++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
@@ -7,7 +7,7 @@ #include <memory> -#include "ash/common/frame/header_painter.h" +#include "ash/frame/header_painter.h" #include "base/compiler_specific.h" // override #include "base/macros.h" #include "ui/gfx/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc index 8f383f9..708d0a2 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -7,12 +7,12 @@ #include <algorithm> #include "ash/common/ash_layout_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/default_header_painter.h" -#include "ash/common/frame/frame_border_hit_test.h" -#include "ash/common/frame/header_painter_util.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/default_header_painter.h" +#include "ash/frame/frame_border_hit_test.h" +#include "ash/frame/header_painter_util.h" #include "base/feature_list.h" #include "build/build_config.h" #include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index 931f739..ec29999 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -5,12 +5,12 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" #include "ash/common/ash_constants.h" -#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/common/frame/header_painter.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" +#include "ash/frame/caption_buttons/frame_caption_button_container_view.h" +#include "ash/frame/header_painter.h" #include "ash/shell.h" #include "ash/test/immersive_fullscreen_controller_test_api.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc index 8e1cd9d..59966b1 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" #include "ash/common/material_design/material_design_controller.h" -#include "ash/common/wm/window_state.h" #include "ash/shared/immersive_revealed_lock.h" #include "ash/shell.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/macros.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h index b47321e86..6a6d51e7 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
@@ -7,9 +7,9 @@ #include <memory> -#include "ash/common/wm/window_state_observer.h" #include "ash/shared/immersive_fullscreen_controller.h" #include "ash/shared/immersive_fullscreen_controller_delegate.h" +#include "ash/wm/window_state_observer.h" #include "base/macros.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc index 9f3f0759..d9894e6 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" -#include "ash/common/shelf/shelf_layout_manager.h" #include "ash/public/cpp/shelf_types.h" #include "ash/root_window_controller.h" +#include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/immersive_fullscreen_controller_test_api.h"
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 5aea784..63ae424 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -41,7 +41,7 @@ #include "url/gurl.h" #if defined(USE_ASH) -#include "ash/common/wm/window_state.h" // nogncheck +#include "ash/wm/window_state.h" // nogncheck #include "ash/wm/window_state_aura.h" // nogncheck #endif
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 7e52331..734c9bc3 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -41,10 +41,10 @@ #include "ui/views/widget/widget.h" #if defined(USE_ASH) -#include "ash/common/accelerators/accelerator_commands.h" // nogncheck -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" // nogncheck -#include "ash/common/wm/window_state.h" // nogncheck +#include "ash/accelerators/accelerator_commands.h" // nogncheck #include "ash/common/wm_shell.h" // nogncheck +#include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck +#include "ash/wm/window_state.h" // nogncheck #include "ash/wm/window_state_aura.h" // nogncheck #include "ui/wm/core/coordinate_conversion.h" // nogncheck #endif
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 244c71de..768e71b 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -63,12 +63,12 @@ #if defined(USE_ASH) #include "ash/common/ash_switches.h" -#include "ash/common/wm/root_window_finder.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/test/immersive_fullscreen_controller_test_api.h" +#include "ash/wm/root_window_finder.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc index 4b828121..ab91890d 100644 --- a/chrome/browser/ui/views/tabs/window_finder_ash.cc +++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/tabs/window_finder.h" -#include "ash/common/wm/root_window_finder.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/root_window_finder.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h"
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index b9a1be79..0e56187 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -35,9 +35,9 @@ #if defined(USE_ASH) // Note: gn check complains here, despite the correct conditional //ash dep. -#include "ash/common/shelf/shelf_item_types.h" // nogncheck #include "ash/public/cpp/window_properties.h" // nogncheck #include "ash/resources/grit/ash_resources.h" // nogncheck +#include "ash/shelf/shelf_item_types.h" // nogncheck #include "ash/wm/window_util.h" // nogncheck #include "chrome/browser/ui/ash/ash_util.h" // nogncheck #include "ui/aura/client/aura_constants.h"
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc index 13cc57dd..3e36a293 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_shell.h" +#include "ash/shelf/wm_shelf.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 84e4b4f..d84a98b 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "ash/common/wm/screen_dimmer.h" +#include "ash/wm/screen_dimmer.h" #include "base/command_line.h" #include "base/logging.h" #include "base/macros.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index 2183bcdf..f3c4ea6 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -24,8 +24,8 @@ #if defined(USE_ASH) #include "ash/common/ash_switches.h" -#include "ash/common/wm/window_positioner.h" // nogncheck #include "ash/shell.h" // nogncheck +#include "ash/wm/window_positioner.h" // nogncheck #include "chrome/browser/ui/ash/ash_util.h" // nogncheck #endif
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc index 89c18ebe8..afb0aed2 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/window_sizer/window_sizer.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" #include "ash/shell.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_state.h" #include "chrome/browser/ui/ash/ash_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc index 9e0ebf65..4fa16e6c 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/shelf/shelf_view.h" -#include "ash/common/shelf/wm_shelf.h" #include "ash/common/wm_window.h" +#include "ash/shelf/shelf_view.h" +#include "ash/shelf/wm_shelf.h" #include "ash/shell.h" #include "base/command_line.h" #include "base/location.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index aee502a..e61b306 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -3,13 +3,13 @@ // found in the LICENSE file. #include "ash/common/scoped_root_window_for_new_windows.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/memory/ptr_util.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc index 039a1ad..cd748e3 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <utility> -#include "ash/common/wm/window_resizer.h" +#include "ash/wm/window_resizer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "build/build_config.h"
diff --git a/chrome/test/base/view_event_test_platform_part_chromeos.cc b/chrome/test/base/view_event_test_platform_part_chromeos.cc index 3714ff6..3e885a4 100644 --- a/chrome/test/base/view_event_test_platform_part_chromeos.cc +++ b/chrome/test/base/view_event_test_platform_part_chromeos.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "ash/common/test/test_session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_init_params.h" #include "ash/test/ash_test_helper.h" +#include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" #include "base/command_line.h" #include "base/macros.h"
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc index f495138..9dbe73ea0 100644 --- a/components/exo/pointer_unittest.cc +++ b/components/exo/pointer_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioning_utils.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/window_positioning_utils.h" #include "components/exo/buffer.h" #include "components/exo/pointer.h" #include "components/exo/pointer_delegate.h"
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc index 00a36da..1083866de 100644 --- a/components/exo/shell_surface.cc +++ b/components/exo/shell_surface.cc
@@ -6,12 +6,12 @@ #include <algorithm> -#include "ash/common/frame/custom_frame_view_ash.h" -#include "ash/common/shelf/wm_shelf.h" -#include "ash/common/wm/window_resizer.h" -#include "ash/common/wm/window_state.h" #include "ash/common/wm_window.h" +#include "ash/frame/custom_frame_view_ash.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/shelf/wm_shelf.h" +#include "ash/wm/window_resizer.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/logging.h"
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h index 74ff30d..ec3d6ab 100644 --- a/components/exo/shell_surface.h +++ b/components/exo/shell_surface.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "ash/common/wm/window_state_observer.h" +#include "ash/wm/window_state_observer.h" #include "base/macros.h" #include "base/strings/string16.h" #include "components/exo/surface_delegate.h"
diff --git a/components/exo/shell_surface_unittest.cc b/components/exo/shell_surface_unittest.cc index 45cc534..86bd001 100644 --- a/components/exo/shell_surface_unittest.cc +++ b/components/exo/shell_surface_unittest.cc
@@ -3,12 +3,12 @@ // found in the LICENSE file. #include "ash/common/accessibility_delegate.h" -#include "ash/common/wm/window_state.h" -#include "ash/common/wm/wm_event.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" +#include "ash/wm/wm_event.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "components/exo/buffer.h"
diff --git a/components/exo/test/exo_test_helper.cc b/components/exo/test/exo_test_helper.cc index e10c6da2..45a00396 100644 --- a/components/exo/test/exo_test_helper.cc +++ b/components/exo/test/exo_test_helper.cc
@@ -4,10 +4,10 @@ #include "components/exo/test/exo_test_helper.h" -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_positioning_utils.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_positioning_utils.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" #include "components/exo/surface.h"
diff --git a/components/exo/touch_unittest.cc b/components/exo/touch_unittest.cc index 18917fb..8b9ed93 100644 --- a/components/exo/touch_unittest.cc +++ b/components/exo/touch_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_positioning_utils.h" #include "ash/common/wm_shell.h" #include "ash/common/wm_window.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_positioning_utils.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" #include "components/exo/surface.h"
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc index c5fc9a5..273af51e 100644 --- a/components/exo/wm_helper_ash.cc +++ b/components/exo/wm_helper_ash.cc
@@ -5,10 +5,10 @@ #include "components/exo/wm_helper_ash.h" #include "ash/common/accessibility_delegate.h" -#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" #include "ash/common/wm_shell.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" +#include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/memory/singleton.h" #include "ui/aura/client/focus_client.h" #include "ui/display/manager/display_manager.h"
diff --git a/third_party/WebKit/Source/core/BUILD.gn b/third_party/WebKit/Source/core/BUILD.gn index eb6c01d..b5b30b4 100644 --- a/third_party/WebKit/Source/core/BUILD.gn +++ b/third_party/WebKit/Source/core/BUILD.gn
@@ -1302,6 +1302,7 @@ "layout/compositing/CompositingReasonFinderTest.cpp", "layout/line/InlineBoxTest.cpp", "layout/line/InlineTextBoxTest.cpp", + "layout/ng/geometry/ng_box_strut_test.cc", "layout/ng/geometry/ng_logical_offset_test.cc", "layout/ng/geometry/ng_physical_rect_test.cc", "layout/ng/ng_absolute_utils_test.cc", @@ -1313,8 +1314,8 @@ "layout/ng/ng_inline_node_test.cc", "layout/ng/ng_layout_inline_items_builder_test.cc", "layout/ng/ng_length_utils_test.cc", + "layout/ng/ng_min_max_content_size_test.cc", "layout/ng/ng_out_of_flow_layout_part_test.cc", - "layout/ng/ng_units_test.cc", "layout/shapes/BoxShapeTest.cpp", "layout/svg/LayoutSVGRootTest.cpp", "loader/DocumentLoadTimingTest.cpp",
diff --git a/third_party/WebKit/Source/core/layout/BUILD.gn b/third_party/WebKit/Source/core/layout/BUILD.gn index cea809c..acd5a62 100644 --- a/third_party/WebKit/Source/core/layout/BUILD.gn +++ b/third_party/WebKit/Source/core/layout/BUILD.gn
@@ -280,10 +280,17 @@ "line/RootInlineBox.cpp", "line/TrailingObjects.cpp", "line/TrailingObjects.h", + "ng/geometry/ng_box_strut.cc", + "ng/geometry/ng_box_strut.h", + "ng/geometry/ng_edge.h", "ng/geometry/ng_logical_offset.cc", "ng/geometry/ng_logical_offset.h", + "ng/geometry/ng_logical_rect.cc", + "ng/geometry/ng_logical_rect.h", "ng/geometry/ng_logical_size.cc", "ng/geometry/ng_logical_size.h", + "ng/geometry/ng_margin_strut.cc", + "ng/geometry/ng_margin_strut.h", "ng/geometry/ng_physical_location.cc", "ng/geometry/ng_physical_location.h", "ng/geometry/ng_physical_offset.cc", @@ -292,6 +299,8 @@ "ng/geometry/ng_physical_rect.h", "ng/geometry/ng_physical_size.cc", "ng/geometry/ng_physical_size.h", + "ng/geometry/ng_static_position.cc", + "ng/geometry/ng_static_position.h", "ng/layout_ng_block_flow.cc", "ng/layout_ng_block_flow.h", "ng/ng_absolute_utils.cc", @@ -313,6 +322,8 @@ "ng/ng_constraint_space.h", "ng/ng_constraint_space_builder.cc", "ng/ng_constraint_space_builder.h", + "ng/ng_exclusion.cc", + "ng/ng_exclusion.h", "ng/ng_floating_object.h", "ng/ng_fragment.cc", "ng/ng_fragment.h", @@ -335,6 +346,8 @@ "ng/ng_line_builder.cc", "ng/ng_line_builder.h", "ng/ng_macros.h", + "ng/ng_min_max_content_size.cc", + "ng/ng_min_max_content_size.h", "ng/ng_out_of_flow_layout_part.cc", "ng/ng_out_of_flow_layout_part.h", "ng/ng_physical_box_fragment.cc", @@ -346,8 +359,6 @@ "ng/ng_text_fragment.h", "ng/ng_text_layout_algorithm.cc", "ng/ng_text_layout_algorithm.h", - "ng/ng_units.cc", - "ng/ng_units.h", "ng/ng_writing_mode.cc", "ng/ng_writing_mode.h", "shapes/BoxShape.cpp",
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut.cc b/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut.cc new file mode 100644 index 0000000..2fa7228 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut.cc
@@ -0,0 +1,56 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/geometry/ng_box_strut.h" + +#include "wtf/text/WTFString.h" + +namespace blink { + +bool NGBoxStrut::IsEmpty() const { + return *this == NGBoxStrut(); +} + +bool NGBoxStrut::operator==(const NGBoxStrut& other) const { + return std::tie(other.inline_start, other.inline_end, other.block_start, + other.block_end) == + std::tie(inline_start, inline_end, block_start, block_end); +} + +// Converts physical dimensions to logical ones per +// https://drafts.csswg.org/css-writing-modes-3/#logical-to-physical +NGBoxStrut NGPhysicalBoxStrut::ConvertToLogical(NGWritingMode writing_mode, + TextDirection direction) const { + NGBoxStrut strut; + switch (writing_mode) { + case kHorizontalTopBottom: + strut = {left, right, top, bottom}; + break; + case kVerticalRightLeft: + case kSidewaysRightLeft: + strut = {top, bottom, right, left}; + break; + case kVerticalLeftRight: + strut = {top, bottom, left, right}; + break; + case kSidewaysLeftRight: + strut = {bottom, top, left, right}; + break; + } + if (direction == TextDirection::kRtl) + std::swap(strut.inline_start, strut.inline_end); + return strut; +} + +String NGBoxStrut::ToString() const { + return String::format("Inline: (%d %d) Block: (%d %d)", inline_start.toInt(), + inline_end.toInt(), block_start.toInt(), + block_end.toInt()); +} + +std::ostream& operator<<(std::ostream& stream, const NGBoxStrut& value) { + return stream << value.ToString(); +} + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut.h b/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut.h new file mode 100644 index 0000000..2e14309b --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut.h
@@ -0,0 +1,74 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NGBoxStrut_h +#define NGBoxStrut_h + +#include "core/CoreExport.h" +#include "core/layout/ng/ng_writing_mode.h" +#include "platform/LayoutUnit.h" +#include "platform/text/TextDirection.h" + +namespace blink { + +// This struct is used for storing margins, borders or padding of a box on all +// four edges. +struct CORE_EXPORT NGBoxStrut { + NGBoxStrut() {} + NGBoxStrut(LayoutUnit inline_start, + LayoutUnit inline_end, + LayoutUnit block_start, + LayoutUnit block_end) + : inline_start(inline_start), + inline_end(inline_end), + block_start(block_start), + block_end(block_end) {} + + LayoutUnit InlineSum() const { return inline_start + inline_end; } + LayoutUnit BlockSum() const { return block_start + block_end; } + + bool IsEmpty() const; + + // The following two operators exist primarily to have an easy way to access + // the sum of border and padding. + NGBoxStrut& operator+=(const NGBoxStrut& other) { + inline_start += other.inline_start; + inline_end += other.inline_end; + block_start += other.block_start; + block_end += other.block_end; + return *this; + } + + NGBoxStrut operator+(const NGBoxStrut& other) { + NGBoxStrut result(*this); + result += other; + return result; + } + + bool operator==(const NGBoxStrut& other) const; + + String ToString() const; + + LayoutUnit inline_start; + LayoutUnit inline_end; + LayoutUnit block_start; + LayoutUnit block_end; +}; + +CORE_EXPORT std::ostream& operator<<(std::ostream&, const NGBoxStrut&); + +// Struct to store physical dimensions, independent of writing mode and +// direction. +// See https://drafts.csswg.org/css-writing-modes-3/#abstract-box +struct CORE_EXPORT NGPhysicalBoxStrut { + LayoutUnit left; + LayoutUnit right; + LayoutUnit top; + LayoutUnit bottom; + NGBoxStrut ConvertToLogical(NGWritingMode, TextDirection) const; +}; + +} // namespace blink + +#endif // NGBoxStrut_h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_units_test.cc b/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut_test.cc similarity index 71% rename from third_party/WebKit/Source/core/layout/ng/ng_units_test.cc rename to third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut_test.cc index cd9b9318..7beacbd 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_units_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_box_strut_test.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/geometry/ng_box_strut.h" #include "testing/gtest/include/gtest/gtest.h" @@ -12,7 +12,7 @@ // Ideally, this would be tested by NGBoxStrut::ConvertToPhysical, but // this has not been implemented yet. -TEST(NGUnitsTest, ConvertPhysicalStrutToLogical) { +TEST(NGGeometryUnitsTest, ConvertPhysicalStrutToLogical) { LayoutUnit left{5}, right{10}, top{15}, bottom{20}; NGPhysicalBoxStrut physical{left, right, top, bottom}; @@ -43,22 +43,6 @@ EXPECT_EQ(right, logical.block_start); } -TEST(NGUnitsTest, ShrinkToFit) { - MinAndMaxContentSizes sizes; - - sizes.min_content = LayoutUnit(100); - sizes.max_content = LayoutUnit(200); - EXPECT_EQ(LayoutUnit(200), sizes.ShrinkToFit(LayoutUnit(300))); - - sizes.min_content = LayoutUnit(100); - sizes.max_content = LayoutUnit(300); - EXPECT_EQ(LayoutUnit(200), sizes.ShrinkToFit(LayoutUnit(200))); - - sizes.min_content = LayoutUnit(200); - sizes.max_content = LayoutUnit(300); - EXPECT_EQ(LayoutUnit(200), sizes.ShrinkToFit(LayoutUnit(100))); -} - } // namespace } // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_edge.h b/third_party/WebKit/Source/core/layout/ng/geometry/ng_edge.h new file mode 100644 index 0000000..062bc74 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_edge.h
@@ -0,0 +1,21 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NGEdge_h +#define NGEdge_h + +#include "core/CoreExport.h" +#include "platform/LayoutUnit.h" + +namespace blink { + +// Struct to represent a simple edge that has start and end. +struct CORE_EXPORT NGEdge { + LayoutUnit start; + LayoutUnit end; +}; + +} // namespace blink + +#endif // NGEdge_h
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_rect.cc b/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_rect.cc new file mode 100644 index 0000000..90a5672f2 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_rect.cc
@@ -0,0 +1,39 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/geometry/ng_logical_rect.h" + +#include "wtf/text/WTFString.h" + +namespace blink { + +bool NGLogicalRect::IsEmpty() const { + return size.IsEmpty() && offset.inline_offset == LayoutUnit() && + offset.block_offset == LayoutUnit(); +} + +bool NGLogicalRect::IsContained(const NGLogicalRect& other) const { + return !(InlineEndOffset() <= other.InlineStartOffset() || + BlockEndOffset() <= other.BlockStartOffset() || + InlineStartOffset() >= other.InlineEndOffset() || + BlockStartOffset() >= other.BlockEndOffset()); +} + +bool NGLogicalRect::operator==(const NGLogicalRect& other) const { + return std::tie(other.offset, other.size) == std::tie(offset, size); +} + +String NGLogicalRect::ToString() const { + return String::format("%s,%s %sx%s", + offset.inline_offset.toString().ascii().data(), + offset.block_offset.toString().ascii().data(), + size.inline_size.toString().ascii().data(), + size.block_size.toString().ascii().data()); +} + +std::ostream& operator<<(std::ostream& os, const NGLogicalRect& value) { + return os << value.ToString(); +} + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_rect.h b/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_rect.h new file mode 100644 index 0000000..1256793 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_rect.h
@@ -0,0 +1,55 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NGLogicalRect_h +#define NGLogicalRect_h + +#include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_logical_offset.h" +#include "core/layout/ng/geometry/ng_logical_size.h" +#include "platform/LayoutUnit.h" + +namespace blink { + +// NGLogicalRect is the position and size of a rect (typically a fragment) +// relative to its parent rect in the logical coordinate system. +struct CORE_EXPORT NGLogicalRect { + NGLogicalRect() {} + NGLogicalRect(const NGLogicalOffset& offset, const NGLogicalSize& size) + : offset(offset), size(size) {} + NGLogicalRect(LayoutUnit inline_offset, + LayoutUnit block_offset, + LayoutUnit inline_size, + LayoutUnit block_size) + : offset(inline_offset, block_offset), size(inline_size, block_size) {} + + bool IsEmpty() const; + + // Whether this rectangle is contained by the provided rectangle. + bool IsContained(const NGLogicalRect& other) const; + + LayoutUnit InlineStartOffset() const { return offset.inline_offset; } + LayoutUnit InlineEndOffset() const { + return offset.inline_offset + size.inline_size; + } + LayoutUnit BlockStartOffset() const { return offset.block_offset; } + LayoutUnit BlockEndOffset() const { + return offset.block_offset + size.block_size; + } + + LayoutUnit BlockSize() const { return size.block_size; } + LayoutUnit InlineSize() const { return size.inline_size; } + + String ToString() const; + bool operator==(const NGLogicalRect& other) const; + + NGLogicalOffset offset; + NGLogicalSize size; +}; + +CORE_EXPORT std::ostream& operator<<(std::ostream&, const NGLogicalRect&); + +} // namespace blink + +#endif // NGLogicalRect_h
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_size.h b/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_size.h index 2102165..448cd9d0 100644 --- a/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_size.h +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_logical_size.h
@@ -12,6 +12,7 @@ namespace blink { struct NGPhysicalSize; +#define NGSizeIndefinite LayoutUnit(-1) // NGLogicalSize is the size of rect (typically a fragment) in the logical // coordinate system.
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_margin_strut.cc b/third_party/WebKit/Source/core/layout/ng/geometry/ng_margin_strut.cc new file mode 100644 index 0000000..eabab22 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_margin_strut.cc
@@ -0,0 +1,35 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/geometry/ng_margin_strut.h" + +#include "wtf/text/WTFString.h" + +namespace blink { + +LayoutUnit NGMarginStrut::Sum() const { + return margin + negative_margin; +} + +bool NGMarginStrut::operator==(const NGMarginStrut& other) const { + return margin == other.margin && negative_margin == other.negative_margin; +} + +void NGMarginStrut::Append(const LayoutUnit& value) { + if (value < 0) { + negative_margin = std::min(value, negative_margin); + } else { + margin = std::max(value, margin); + } +} + +String NGMarginStrut::ToString() const { + return String::format("%d %d", margin.toInt(), negative_margin.toInt()); +} + +std::ostream& operator<<(std::ostream& stream, const NGMarginStrut& value) { + return stream << value.ToString(); +} + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_margin_strut.h b/third_party/WebKit/Source/core/layout/ng/geometry/ng_margin_strut.h new file mode 100644 index 0000000..d67239d1 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_margin_strut.h
@@ -0,0 +1,33 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NGMarginStrut_h +#define NGMarginStrut_h + +#include "core/CoreExport.h" +#include "platform/LayoutUnit.h" + +namespace blink { + +// This struct is used for the margin collapsing calculation. +struct CORE_EXPORT NGMarginStrut { + LayoutUnit margin; + LayoutUnit negative_margin; + + // Appends negative or positive value to the current margin strut. + void Append(const LayoutUnit& value); + + // Sum up negative and positive margins of this strut. + LayoutUnit Sum() const; + + bool operator==(const NGMarginStrut& other) const; + + String ToString() const; +}; + +CORE_EXPORT std::ostream& operator<<(std::ostream&, const NGMarginStrut&); + +} // namespace blink + +#endif // NGMarginStrut_h
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_static_position.cc b/third_party/WebKit/Source/core/layout/ng/geometry/ng_static_position.cc new file mode 100644 index 0000000..43e3d04d --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_static_position.cc
@@ -0,0 +1,35 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/geometry/ng_static_position.h" + +namespace blink { + +NGStaticPosition NGStaticPosition::Create(NGWritingMode writing_mode, + TextDirection direction, + NGPhysicalOffset offset) { + NGStaticPosition position; + position.offset = offset; + switch (writing_mode) { + case kHorizontalTopBottom: + position.type = (direction == TextDirection::kLtr) ? kTopLeft : kTopRight; + break; + case kVerticalRightLeft: + case kSidewaysRightLeft: + position.type = + (direction == TextDirection::kLtr) ? kTopRight : kBottomRight; + break; + case kVerticalLeftRight: + position.type = + (direction == TextDirection::kLtr) ? kTopLeft : kBottomLeft; + break; + case kSidewaysLeftRight: + position.type = + (direction == TextDirection::kLtr) ? kBottomLeft : kTopLeft; + break; + } + return position; +} + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/geometry/ng_static_position.h b/third_party/WebKit/Source/core/layout/ng/geometry/ng_static_position.h new file mode 100644 index 0000000..6e39b08 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/geometry/ng_static_position.h
@@ -0,0 +1,73 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NGStaticPosition_h +#define NGStaticPosition_h + +#include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_physical_offset.h" +#include "core/layout/ng/ng_writing_mode.h" +#include "platform/LayoutUnit.h" +#include "platform/text/TextDirection.h" + +namespace blink { + +// Represents static position of an out of flow descendant. +struct CORE_EXPORT NGStaticPosition { + enum Type { kTopLeft, kTopRight, kBottomLeft, kBottomRight }; + + Type type; // Logical corner that corresponds to physical top left. + NGPhysicalOffset offset; + + // Creates a position with proper type wrt writing mode and direction. + static NGStaticPosition Create(NGWritingMode, + TextDirection, + NGPhysicalOffset); + // Left/Right/TopPosition functions map static position to + // left/right/top edge wrt container space. + // The function arguments are required to solve the equation: + // contaner_size = left + margin_left + width + margin_right + right + LayoutUnit LeftPosition(LayoutUnit container_size, + LayoutUnit width, + LayoutUnit margin_left, + LayoutUnit margin_right) const { + return GenericPosition(HasLeft(), offset.left, container_size, width, + margin_left, margin_right); + } + LayoutUnit RightPosition(LayoutUnit container_size, + LayoutUnit width, + LayoutUnit margin_left, + LayoutUnit margin_right) const { + return GenericPosition(!HasLeft(), offset.left, container_size, width, + margin_left, margin_right); + } + LayoutUnit TopPosition(LayoutUnit container_size, + LayoutUnit height, + LayoutUnit margin_top, + LayoutUnit margin_bottom) const { + return GenericPosition(HasTop(), offset.top, container_size, height, + margin_top, margin_bottom); + } + + private: + bool HasTop() const { return type == kTopLeft || type == kTopRight; } + bool HasLeft() const { return type == kTopLeft || type == kBottomLeft; } + LayoutUnit GenericPosition(bool position_matches, + LayoutUnit position, + LayoutUnit container_size, + LayoutUnit length, + LayoutUnit margin_start, + LayoutUnit margin_end) const { + DCHECK_GE(container_size, LayoutUnit()); + DCHECK_GE(length, LayoutUnit()); + if (position_matches) + return position; + else + return container_size - position - length - margin_start - margin_end; + } +}; + +} // namespace blink + +#endif // NGStaticPosition_h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.cc b/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.cc index 56ce36f..5347de18 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.cc
@@ -28,7 +28,7 @@ LayoutUnit ResolveWidth(const Length& width, const NGConstraintSpace& space, const ComputedStyle& style, - const Optional<MinAndMaxContentSizes>& child_minmax, + const Optional<MinMaxContentSize>& child_minmax, LengthResolveType resolve_type) { if (space.WritingMode() == kHorizontalTopBottom) return ResolveInlineLength(space, style, child_minmax, width, resolve_type); @@ -41,7 +41,7 @@ LayoutUnit ResolveHeight(const Length& height, const NGConstraintSpace& space, const ComputedStyle& style, - const Optional<MinAndMaxContentSizes>& child_minmax, + const Optional<MinMaxContentSize>& child_minmax, LengthResolveType resolve_type) { if (space.WritingMode() != kHorizontalTopBottom) return ResolveInlineLength(space, style, child_minmax, height, @@ -54,13 +54,12 @@ // Implement absolute horizontal size resolution algorithm. // https://www.w3.org/TR/css-position-3/#abs-non-replaced-width -void ComputeAbsoluteHorizontal( - const NGConstraintSpace& space, - const ComputedStyle& style, - const Optional<LayoutUnit>& incoming_width, - const NGStaticPosition& static_position, - const Optional<MinAndMaxContentSizes>& child_minmax, - NGAbsolutePhysicalPosition* position) { +void ComputeAbsoluteHorizontal(const NGConstraintSpace& space, + const ComputedStyle& style, + const Optional<LayoutUnit>& incoming_width, + const NGStaticPosition& static_position, + const Optional<MinMaxContentSize>& child_minmax, + NGAbsolutePhysicalPosition* position) { NGLogicalSize percentage_logical = space.PercentageResolutionSize(); NGPhysicalSize percentage_physical = percentage_logical.ConvertToPhysical(space.WritingMode()); @@ -215,13 +214,12 @@ // Implements absolute vertical size resolution algorithm. // https://www.w3.org/TR/css-position-3/#abs-non-replaced-height -void ComputeAbsoluteVertical( - const NGConstraintSpace& space, - const ComputedStyle& style, - const Optional<LayoutUnit>& incoming_height, - const NGStaticPosition& static_position, - const Optional<MinAndMaxContentSizes>& child_minmax, - NGAbsolutePhysicalPosition* position) { +void ComputeAbsoluteVertical(const NGConstraintSpace& space, + const ComputedStyle& style, + const Optional<LayoutUnit>& incoming_height, + const NGStaticPosition& static_position, + const Optional<MinMaxContentSize>& child_minmax, + NGAbsolutePhysicalPosition* position) { NGLogicalSize percentage_logical = space.PercentageResolutionSize(); NGPhysicalSize percentage_physical = percentage_logical.ConvertToPhysical(space.WritingMode()); @@ -383,7 +381,7 @@ const NGConstraintSpace& space, const ComputedStyle& style, const NGStaticPosition& static_position, - const Optional<MinAndMaxContentSizes>& child_minmax) { + const Optional<MinMaxContentSize>& child_minmax) { NGAbsolutePhysicalPosition position; if (style.isHorizontalWritingMode()) { Optional<LayoutUnit> width; @@ -415,9 +413,9 @@ // unknown, or fully computed, there is no minmax. // To express this, a 'fixed' minmax is created where // min and max are the same. - Optional<MinAndMaxContentSizes> child_minmax; + Optional<MinMaxContentSize> child_minmax; if (child_block_size.has_value()) { - child_minmax = MinAndMaxContentSizes{*child_block_size, *child_block_size}; + child_minmax = MinMaxContentSize{*child_block_size, *child_block_size}; } if (style.isHorizontalWritingMode()) { Optional<LayoutUnit> height;
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.h b/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.h index 1513af4..4c9bec4 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils.h
@@ -6,7 +6,10 @@ #define NGAbsoluteUtils_h #include "core/CoreExport.h" -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/geometry/ng_box_strut.h" +#include "core/layout/ng/geometry/ng_physical_size.h" +#include "core/layout/ng/geometry/ng_static_position.h" +#include "core/layout/ng/ng_min_max_content_size.h" #include "platform/LayoutUnit.h" #include "wtf/Optional.h" @@ -27,7 +30,7 @@ // The size is computed as NGAbsolutePhysicalPosition. // It needs to be computed in 4 stages: // 1. If AbsoluteNeedsChildInlineSize compute estimated inline_size using -// MinAndMaxContentSizes.ShrinkToFit. +// MinMaxContentSize.ShrinkToFit. // 2. Compute part of PhysicalPosition that depends upon child inline size // with ComputePartialAbsoluteWithChildInlineSize. // 3. If AbsoluteNeedsChildBlockSize compute estimated block_size by @@ -50,7 +53,7 @@ const NGConstraintSpace& space, const ComputedStyle& style, const NGStaticPosition&, - const Optional<MinAndMaxContentSizes>& child_minmax); + const Optional<MinMaxContentSize>& child_minmax); // Compute rest of NGPhysicalRect that depends on child's block_size. CORE_EXPORT void ComputeFullAbsoluteWithChildBlockSize(
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils_test.cc index acdfb59f8..930b314 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_absolute_utils_test.cc
@@ -107,8 +107,8 @@ LayoutUnit width = container_size_.inline_size - left - margin_left - right - margin_right; - Optional<MinAndMaxContentSizes> estimated_inline; - MinAndMaxContentSizes minmax_60{LayoutUnit(60), LayoutUnit(60)}; + Optional<MinMaxContentSize> estimated_inline; + MinMaxContentSize minmax_60{LayoutUnit(60), LayoutUnit(60)}; style_->setBorderLeftWidth(border_left.toInt()); style_->setBorderRightWidth(border_right.toInt()); @@ -430,7 +430,7 @@ NGStaticPosition static_position{NGStaticPosition::kTopLeft, {LayoutUnit(), LayoutUnit()}}; - MinAndMaxContentSizes estimated_inline{LayoutUnit(20), LayoutUnit(20)}; + MinMaxContentSize estimated_inline{LayoutUnit(20), LayoutUnit(20)}; NGAbsolutePhysicalPosition p; // WIDTH TESTS
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc index 975015069..f3a53a8a 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
@@ -17,7 +17,6 @@ #include "core/layout/ng/ng_length_utils.h" #include "core/layout/ng/ng_line_builder.h" #include "core/layout/ng/ng_out_of_flow_layout_part.h" -#include "core/layout/ng/ng_units.h" #include "core/style/ComputedStyle.h" #include "platform/LengthFunctions.h" #include "wtf/Optional.h" @@ -313,9 +312,9 @@ builder_(NGPhysicalFragment::kFragmentBox, node), space_builder_(constraint_space_) {} -Optional<MinAndMaxContentSizes> -NGBlockLayoutAlgorithm::ComputeMinAndMaxContentSizes() const { - MinAndMaxContentSizes sizes; +Optional<MinMaxContentSize> NGBlockLayoutAlgorithm::ComputeMinMaxContentSize() + const { + MinMaxContentSize sizes; // Size-contained elements don't consider their contents for intrinsic sizing. if (Style().containsSize()) @@ -324,7 +323,7 @@ // TODO: handle floats & orthogonal children. for (NGLayoutInputNode* node = node_->FirstChild(); node; node = node->NextSibling()) { - MinAndMaxContentSizes child_sizes; + MinMaxContentSize child_sizes; if (node->Type() == NGLayoutInputNode::kLegacyInline) { // From |NGBlockLayoutAlgorithm| perspective, we can handle |NGInlineNode| // almost the same as |NGBlockNode|, because an |NGInlineNode| includes @@ -332,13 +331,12 @@ // an anonymous box that contains all line boxes. // |NextSibling| returns the next block sibling, or nullptr, skipping all // following inline siblings and descendants. - child_sizes = toNGInlineNode(node)->ComputeMinAndMaxContentSizes(); + child_sizes = toNGInlineNode(node)->ComputeMinMaxContentSize(); } else { - Optional<MinAndMaxContentSizes> child_minmax; + Optional<MinMaxContentSize> child_minmax; NGBlockNode* block_child = toNGBlockNode(node); - if (NeedMinAndMaxContentSizesForContentContribution( - block_child->Style())) { - child_minmax = block_child->ComputeMinAndMaxContentSizes(); + if (NeedMinMaxContentSizeForContentContribution(block_child->Style())) { + child_minmax = block_child->ComputeMinMaxContentSize(); } child_sizes = ComputeMinAndMaxContentContribution(block_child->Style(), @@ -378,9 +376,9 @@ } RefPtr<NGLayoutResult> NGBlockLayoutAlgorithm::Layout() { - WTF::Optional<MinAndMaxContentSizes> sizes; - if (NeedMinAndMaxContentSizes(ConstraintSpace(), Style())) - sizes = ComputeMinAndMaxContentSizes(); + WTF::Optional<MinMaxContentSize> sizes; + if (NeedMinMaxContentSize(ConstraintSpace(), Style())) + sizes = ComputeMinMaxContentSize(); border_and_padding_ = ComputeBorders(ConstraintSpace(), Style()) + ComputePadding(ConstraintSpace(), Style()); @@ -672,9 +670,9 @@ DCHECK(child); const ComputedStyle& child_style = child->Style(); - WTF::Optional<MinAndMaxContentSizes> sizes; - if (NeedMinAndMaxContentSizes(space, child_style)) - sizes = child->ComputeMinAndMaxContentSizes(); + WTF::Optional<MinMaxContentSize> sizes; + if (NeedMinMaxContentSize(space, child_style)) + sizes = child->ComputeMinMaxContentSize(); LayoutUnit child_inline_size = ComputeInlineSizeForFragment(space, child_style, sizes);
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h index 505983a..904777d 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
@@ -6,11 +6,11 @@ #define NGBlockLayoutAlgorithm_h #include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_margin_strut.h" #include "core/layout/ng/ng_block_node.h" #include "core/layout/ng/ng_constraint_space_builder.h" #include "core/layout/ng/ng_fragment_builder.h" #include "core/layout/ng/ng_layout_algorithm.h" -#include "core/layout/ng/ng_units.h" #include "wtf/RefPtr.h" namespace blink { @@ -34,7 +34,7 @@ NGConstraintSpace* space, NGBlockBreakToken* break_token = nullptr); - Optional<MinAndMaxContentSizes> ComputeMinAndMaxContentSizes() const override; + Optional<MinMaxContentSize> ComputeMinMaxContentSize() const override; RefPtr<NGLayoutResult> Layout() override; private:
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc index 38c45720..c9648b95 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
@@ -16,7 +16,6 @@ #include "core/layout/ng/ng_length_utils.h" #include "core/layout/ng/ng_physical_box_fragment.h" #include "core/layout/ng/ng_physical_fragment.h" -#include "core/layout/ng/ng_units.h" #include "core/style/ComputedStyle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -93,7 +92,7 @@ toNGPhysicalBoxFragment(result->PhysicalFragment().get()), space); } - MinAndMaxContentSizes RunComputeMinAndMax(NGBlockNode* node) { + MinMaxContentSize RunComputeMinAndMax(NGBlockNode* node) { // The constraint space is not used for min/max computation, but we need // it to create the algorithm. RefPtr<NGConstraintSpace> space = @@ -101,8 +100,8 @@ NGLogicalSize(LayoutUnit(), LayoutUnit())); NGBlockLayoutAlgorithm algorithm(node, space.get()); - EXPECT_TRUE(algorithm.ComputeMinAndMaxContentSizes().has_value()); - return *algorithm.ComputeMinAndMaxContentSizes(); + EXPECT_TRUE(algorithm.ComputeMinMaxContentSize().has_value()); + return *algorithm.ComputeMinMaxContentSize(); } RefPtr<ComputedStyle> style_; @@ -1260,7 +1259,7 @@ auto* container = new NGBlockNode(getLayoutObjectByElementId("container")); - MinAndMaxContentSizes sizes = RunComputeMinAndMax(container); + MinMaxContentSize sizes = RunComputeMinAndMax(container); EXPECT_EQ(kSecondChildWidth, sizes.min_content); EXPECT_EQ(kSecondChildWidth, sizes.max_content); }
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc index 5276fff8..b39ecf3 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
@@ -17,6 +17,7 @@ #include "core/layout/ng/ng_inline_node.h" #include "core/layout/ng/ng_layout_result.h" #include "core/layout/ng/ng_length_utils.h" +#include "core/layout/ng/ng_min_max_content_size.h" #include "core/layout/ng/ng_writing_mode.h" #include "core/paint/PaintLayer.h" #include "platform/RuntimeEnabledFeatures.h" @@ -97,8 +98,8 @@ return layout_result; } -MinAndMaxContentSizes NGBlockNode::ComputeMinAndMaxContentSizes() { - MinAndMaxContentSizes sizes; +MinMaxContentSize NGBlockNode::ComputeMinMaxContentSize() { + MinMaxContentSize sizes; if (!CanUseNewLayout()) { DCHECK(layout_box_); // TODO(layout-ng): This could be somewhat optimized by directly calling @@ -124,8 +125,8 @@ // TODO(cbiesinger): For orthogonal children, we need to always synthesize. NGBlockLayoutAlgorithm minmax_algorithm(this, constraint_space.get()); - Optional<MinAndMaxContentSizes> maybe_sizes = - minmax_algorithm.ComputeMinAndMaxContentSizes(); + Optional<MinMaxContentSize> maybe_sizes = + minmax_algorithm.ComputeMinMaxContentSize(); if (maybe_sizes.has_value()) return *maybe_sizes;
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.h b/third_party/WebKit/Source/core/layout/ng/ng_block_node.h index fe6c053..2c43ffe8 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.h
@@ -20,7 +20,7 @@ class NGConstraintSpace; class NGLayoutResult; struct NGLogicalOffset; -struct MinAndMaxContentSizes; +struct MinMaxContentSize; // Represents a node to be laid out. class CORE_EXPORT NGBlockNode final : public NGLayoutInputNode { @@ -37,12 +37,12 @@ LayoutObject* GetLayoutObject() override; // Computes the value of min-content and max-content for this box. - // If the underlying layout algorithm's ComputeMinAndMaxContentSizes returns + // If the underlying layout algorithm's ComputeMinMaxContentSize returns // no value, this function will synthesize these sizes using Layout with // special constraint spaces -- infinite available size for max content, zero // available size for min content, and percentage resolution size zero for // both. - MinAndMaxContentSizes ComputeMinAndMaxContentSizes(); + MinMaxContentSize ComputeMinMaxContentSize(); const ComputedStyle& Style() const;
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc index c7a12ff2..7a38c9e5 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node_test.cc
@@ -5,6 +5,9 @@ #include "core/layout/ng/ng_block_node.h" #include "core/layout/LayoutTestHelper.h" +#include "core/layout/ng/ng_box_fragment.h" +#include "core/layout/ng/ng_min_max_content_size.h" +#include "core/style/ComputedStyle.h" #include "testing/gtest/include/gtest/gtest.h" namespace blink { @@ -25,7 +28,7 @@ const int kWidth = 30; NGBlockNode* box = new NGBlockNode(getLayoutObjectByElementId("box")); - MinAndMaxContentSizes sizes = box->ComputeMinAndMaxContentSizes(); + MinMaxContentSize sizes = box->ComputeMinMaxContentSize(); EXPECT_EQ(LayoutUnit(kWidth), sizes.min_content); EXPECT_EQ(LayoutUnit(kWidth), sizes.max_content); }
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_box_fragment.h b/third_party/WebKit/Source/core/layout/ng/ng_box_fragment.h index ceb5c06..484b3046 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_box_fragment.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_box_fragment.h
@@ -8,7 +8,6 @@ #include "core/CoreExport.h" #include "core/layout/ng/ng_fragment.h" #include "core/layout/ng/ng_physical_box_fragment.h" -#include "core/layout/ng/ng_units.h" #include "core/layout/ng/ng_writing_mode.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h index de696c93..f3db8750 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
@@ -6,8 +6,14 @@ #define NGConstraintSpace_h #include "core/CoreExport.h" -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/geometry/ng_logical_offset.h" +#include "core/layout/ng/geometry/ng_logical_size.h" +#include "core/layout/ng/geometry/ng_margin_strut.h" +#include "core/layout/ng/geometry/ng_physical_size.h" +#include "core/layout/ng/ng_exclusion.h" #include "core/layout/ng/ng_writing_mode.h" +#include "platform/heap/Handle.h" +#include "platform/text/TextDirection.h" #include "wtf/Optional.h" #include "wtf/RefCounted.h" #include "wtf/text/WTFString.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h index 40d95ad..d1b6458 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h
@@ -6,7 +6,6 @@ #define NGConstraintSpaceBuilder_h #include "core/layout/ng/ng_constraint_space.h" -#include "core/layout/ng/ng_units.h" #include "wtf/Allocator.h" #include "wtf/Optional.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder_test.cc index 3a628fc..8fb109d 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder_test.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "core/layout/ng/ng_constraint_space_builder.h" -#include "core/layout/ng/ng_units.h" #include "core/layout/LayoutTestHelper.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_exclusion.cc b/third_party/WebKit/Source/core/layout/ng/ng_exclusion.cc new file mode 100644 index 0000000..e5f711b --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/ng_exclusion.cc
@@ -0,0 +1,50 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/ng_exclusion.h" + +#include "wtf/text/WTFString.h" + +namespace blink { + +bool NGExclusion::operator==(const NGExclusion& other) const { + return std::tie(other.rect, other.type) == std::tie(rect, type); +} + +String NGExclusion::ToString() const { + return String::format("Rect: %s Type: %d", rect.ToString().ascii().data(), + type); +} + +std::ostream& operator<<(std::ostream& stream, const NGExclusion& value) { + return stream << value.ToString(); +} + +NGExclusions::NGExclusions() + : last_left_float(nullptr), last_right_float(nullptr) {} + +NGExclusions::NGExclusions(const NGExclusions& other) { + for (const auto& exclusion : other.storage) + Add(*exclusion); +} + +void NGExclusions::Add(const NGExclusion& exclusion) { + storage.push_back(WTF::makeUnique<NGExclusion>(exclusion)); + if (exclusion.type == NGExclusion::kFloatLeft) { + last_left_float = storage.rbegin()->get(); + } else if (exclusion.type == NGExclusion::kFloatRight) { + last_right_float = storage.rbegin()->get(); + } +} + +inline NGExclusions& NGExclusions::operator=(const NGExclusions& other) { + storage.clear(); + last_left_float = nullptr; + last_right_float = nullptr; + for (const auto& exclusion : other.storage) + Add(*exclusion); + return *this; +} + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_exclusion.h b/third_party/WebKit/Source/core/layout/ng/ng_exclusion.h new file mode 100644 index 0000000..b8b86edd --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/ng_exclusion.h
@@ -0,0 +1,57 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NGExclusion_h +#define NGExclusion_h + +#include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_logical_rect.h" +#include "wtf/Vector.h" + +namespace blink { + +// Struct that represents NG exclusion. +struct CORE_EXPORT NGExclusion { + // Type of NG exclusion. + enum Type { + // Undefined exclusion type. + // At this moment it's also used to represent CSS3 exclusion. + kExclusionTypeUndefined = 0, + // Exclusion that is created by LEFT float. + kFloatLeft = 1, + // Exclusion that is created by RIGHT float. + kFloatRight = 2 + }; + + // Rectangle in logical coordinates the represents this exclusion. + NGLogicalRect rect; + + // Type of this exclusion. + Type type; + + bool operator==(const NGExclusion& other) const; + String ToString() const; +}; + +CORE_EXPORT std::ostream& operator<<(std::ostream&, const NGExclusion&); + +struct CORE_EXPORT NGExclusions { + NGExclusions(); + NGExclusions(const NGExclusions& other); + + Vector<std::unique_ptr<const NGExclusion>> storage; + + // Last left/right float exclusions are used to enforce the top edge alignment + // rule for floats and for the support of CSS "clear" property. + const NGExclusion* last_left_float; // Owned by storage. + const NGExclusion* last_right_float; // Owned by storage. + + NGExclusions& operator=(const NGExclusions& other); + + void Add(const NGExclusion& exclusion); +}; + +} // namespace blink + +#endif // NGExclusion_h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h b/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h index 26a21fac..f841775 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h
@@ -5,9 +5,10 @@ #ifndef NGFloatingObject_h #define NGFloatingObject_h +#include "core/layout/ng/geometry/ng_box_strut.h" #include "core/layout/ng/ng_block_node.h" #include "core/layout/ng/ng_constraint_space.h" -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/ng_exclusion.h" #include "core/style/ComputedStyle.h" #include "core/style/ComputedStyleConstants.h" #include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.h b/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.h index dc8a59fb..fd11878d 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.h
@@ -9,7 +9,6 @@ #include "core/layout/ng/ng_constraint_space.h" #include "core/layout/ng/ng_floating_object.h" #include "core/layout/ng/ng_physical_fragment.h" -#include "core/layout/ng/ng_units.h" #include "wtf/Allocator.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc index b948222..a4ba2f3 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
@@ -262,7 +262,7 @@ NGTextLayoutAlgorithm(this, constraint_space).LayoutInline(line_builder); } -MinAndMaxContentSizes NGInlineNode::ComputeMinAndMaxContentSizes() { +MinMaxContentSize NGInlineNode::ComputeMinMaxContentSize() { // Compute the max of inline sizes of all line boxes with 0 available inline // size. This gives the min-content, the width where lines wrap at every break // opportunity. @@ -275,7 +275,7 @@ .ToConstraintSpace(writing_mode); NGLineBuilder line_builder(this, constraint_space.get()); LayoutInline(constraint_space.get(), &line_builder); - MinAndMaxContentSizes sizes; + MinMaxContentSize sizes; sizes.min_content = line_builder.MaxInlineSize(); // max-content is the width without any line wrapping.
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.h b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.h index 20f8b40e..1aecc23 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.h
@@ -22,7 +22,7 @@ class LayoutBlockFlow; class LayoutObject; class LayoutUnit; -struct MinAndMaxContentSizes; +struct MinMaxContentSize; class NGConstraintSpace; class NGLayoutInlineItem; class NGLayoutInlineItemRange; @@ -47,7 +47,7 @@ // Computes the value of min-content and max-content for this anonymous block // box. min-content is the inline size when lines wrap at every break // opportunity, and max-content is when lines do not wrap at all. - MinAndMaxContentSizes ComputeMinAndMaxContentSizes(); + MinMaxContentSize ComputeMinMaxContentSize(); // Instruct to re-compute |PrepareLayout| on the next layout. void InvalidatePrepareLayout();
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc index 482e823..7976c0b 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
@@ -216,25 +216,25 @@ TEST_TEXT_FRAGMENT(fragments[4], node, 8u, 22u, 28u, TextDirection::kLtr); } -TEST_F(NGInlineNodeTest, MinAndMaxContentSizes) { +TEST_F(NGInlineNodeTest, MinMaxContentSize) { setAhemToStyle(); NGInlineNodeForTest* node = new NGInlineNodeForTest(style_.get()); node->Append("AB CDE", style_.get()); node->ShapeText(); - MinAndMaxContentSizes sizes = node->ComputeMinAndMaxContentSizes(); + MinMaxContentSize sizes = node->ComputeMinMaxContentSize(); // TODO(kojii): min_content should be 20, but is 30 until NGLineBuilder // implements trailing spaces correctly. EXPECT_EQ(30, sizes.min_content); EXPECT_EQ(60, sizes.max_content); } -TEST_F(NGInlineNodeTest, MinAndMaxContentSizesElementBoundary) { +TEST_F(NGInlineNodeTest, MinMaxContentSizeElementBoundary) { setAhemToStyle(); NGInlineNodeForTest* node = new NGInlineNodeForTest(style_.get()); node->Append("A B", style_.get()); node->Append("C D", style_.get()); node->ShapeText(); - MinAndMaxContentSizes sizes = node->ComputeMinAndMaxContentSizes(); + MinMaxContentSize sizes = node->ComputeMinMaxContentSize(); // |min_content| should be the width of "BC" because there is an element // boundary between "B" and "C" but no break opportunities. // TODO(kojii): min_content should be 20, but is 30 until NGLineBuilder
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_algorithm.h index bc2250c..a04f837 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_algorithm.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_algorithm.h
@@ -6,14 +6,14 @@ #define NGLayoutAlgorithm_h #include "core/CoreExport.h" -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/ng_min_max_content_size.h" #include "wtf/Allocator.h" #include "wtf/Noncopyable.h" #include "wtf/Optional.h" namespace blink { -struct MinAndMaxContentSizes; +struct MinMaxContentSize; class NGLayoutResult; // Base class for all LayoutNG algorithms. @@ -34,7 +34,7 @@ // account. If the return value is empty, the caller is expected to synthesize // this value from the overflow rect returned from Layout called with an // available width of 0 and LayoutUnit::max(), respectively. - virtual Optional<MinAndMaxContentSizes> ComputeMinAndMaxContentSizes() const { + virtual Optional<MinMaxContentSize> ComputeMinMaxContentSize() const { return WTF::nullopt; } };
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc index 76961a9..b04dc468 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc
@@ -4,7 +4,7 @@ #include "core/layout/ng/ng_layout_opportunity_iterator.h" -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/ng_exclusion.h" #include "wtf/NonCopyingSort.h" namespace blink {
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h index ea3d3fc..e9780f34 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h
@@ -8,7 +8,6 @@ #include "core/CoreExport.h" #include "core/layout/ng/ng_constraint_space.h" #include "core/layout/ng/ng_layout_opportunity_tree_node.h" -#include "core/layout/ng/ng_units.h" #include "platform/heap/Handle.h" #include "wtf/Optional.h" #include "wtf/Vector.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h index 6c445d1..6e2c913 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h
@@ -5,12 +5,13 @@ #ifndef NGLayoutOpportunityTreeNode_h #define NGLayoutOpportunityTreeNode_h -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/geometry/ng_edge.h" +#include "core/layout/ng/geometry/ng_logical_rect.h" +#include "core/layout/ng/ng_exclusion.h" #include "platform/heap/Handle.h" namespace blink { - // 3 node R-Tree that represents available space(left, bottom, right) or // layout opportunity after the parent spatial rectangle is split by the // exclusion rectangle.
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_result.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_result.h index 49d206a..3ec77699 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_result.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_result.h
@@ -6,8 +6,8 @@ #define NGLayoutResult_h #include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_static_position.h" #include "core/layout/ng/ng_physical_fragment.h" -#include "core/layout/ng/ng_units.h" #include "platform/LayoutUnit.h" #include "platform/heap/Handle.h" #include "wtf/Vector.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc index 2f5d30c..f18089c 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc
@@ -17,8 +17,8 @@ // - replaced calculations // - Take scrollbars into account -bool NeedMinAndMaxContentSizes(const NGConstraintSpace& constraint_space, - const ComputedStyle& style) { +bool NeedMinMaxContentSize(const NGConstraintSpace& constraint_space, + const ComputedStyle& style) { // This check is technically too broad (fill-available does not need intrinsic // size computation) but that's a rare case and only affects performance, not // correctness. @@ -28,8 +28,7 @@ style.logicalMaxWidth().isIntrinsic(); } -bool NeedMinAndMaxContentSizesForContentContribution( - const ComputedStyle& style) { +bool NeedMinMaxContentSizeForContentContribution(const ComputedStyle& style) { return style.logicalWidth().isIntrinsicOrAuto() || style.logicalMinWidth().isIntrinsic() || style.logicalMaxWidth().isIntrinsic(); @@ -38,7 +37,7 @@ LayoutUnit ResolveInlineLength( const NGConstraintSpace& constraint_space, const ComputedStyle& style, - const WTF::Optional<MinAndMaxContentSizes>& min_and_max, + const WTF::Optional<MinMaxContentSize>& min_and_max, const Length& length, LengthResolveType type) { DCHECK(!length.isMaxSizeNone()); @@ -183,9 +182,9 @@ } } -MinAndMaxContentSizes ComputeMinAndMaxContentContribution( +MinMaxContentSize ComputeMinAndMaxContentContribution( const ComputedStyle& style, - const WTF::Optional<MinAndMaxContentSizes>& min_and_max) { + const WTF::Optional<MinMaxContentSize>& min_and_max) { // Synthesize a zero-sized constraint space for passing to // ResolveInlineLength. NGWritingMode writing_mode = FromPlatformWritingMode(style.getWritingMode()); @@ -194,7 +193,7 @@ NGPhysicalSize{LayoutUnit(), LayoutUnit()}); RefPtr<NGConstraintSpace> space = builder.ToConstraintSpace(writing_mode); - MinAndMaxContentSizes computed_sizes; + MinMaxContentSize computed_sizes; Length inline_size = style.logicalWidth(); if (inline_size.isAuto()) { CHECK(min_and_max.has_value()); @@ -234,7 +233,7 @@ LayoutUnit ComputeInlineSizeForFragment( const NGConstraintSpace& space, const ComputedStyle& style, - const WTF::Optional<MinAndMaxContentSizes>& min_and_max) { + const WTF::Optional<MinMaxContentSize>& min_and_max) { if (space.IsFixedSizeInline()) return space.AvailableSize().inline_size; @@ -335,7 +334,7 @@ const NGWritingMode writing_mode, const TextDirection direction) { // We don't need these for margin computations - MinAndMaxContentSizes empty_sizes; + MinMaxContentSize empty_sizes; // Margins always get computed relative to the inline size: // https://www.w3.org/TR/CSS2/box.html#value-def-margin-width NGPhysicalBoxStrut physical_dim; @@ -377,7 +376,7 @@ return NGBoxStrut(); // We don't need these for padding computations - MinAndMaxContentSizes empty_sizes; + MinMaxContentSize empty_sizes; // Padding always gets computed relative to the inline size: // https://www.w3.org/TR/CSS2/box.html#value-def-padding-width NGBoxStrut padding;
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h index 42d59ac..a4e731d9 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h
@@ -6,7 +6,8 @@ #define NGLengthUtils_h #include "core/CoreExport.h" -#include "core/layout/ng/ng_units.h" +#include "core/layout/ng/geometry/ng_box_strut.h" +#include "core/layout/ng/ng_min_max_content_size.h" #include "core/layout/ng/ng_writing_mode.h" #include "platform/text/TextDirection.h" #include "wtf/Optional.h" @@ -15,7 +16,7 @@ class ComputedStyle; class LayoutUnit; class Length; -struct MinAndMaxContentSizes; +struct MinMaxContentSize; class NGConstraintSpace; struct NGBoxStrut; @@ -29,13 +30,13 @@ // Whether the caller needs to compute min-content and max-content sizes to // pass them to ResolveInlineLength / ComputeInlineSizeForFragment. // If this function returns false, it is safe to pass an empty -// MinAndMaxContentSizes struct to those functions. -CORE_EXPORT bool NeedMinAndMaxContentSizes(const NGConstraintSpace&, - const ComputedStyle&); +// MinMaxContentSize struct to those functions. +CORE_EXPORT bool NeedMinMaxContentSize(const NGConstraintSpace&, + const ComputedStyle&); -// Like NeedMinAndMaxContentSizes, but for use when calling +// Like NeedMinMaxContentSize, but for use when calling // ComputeMinAndMaxContentContribution. -CORE_EXPORT bool NeedMinAndMaxContentSizesForContentContribution( +CORE_EXPORT bool NeedMinMaxContentSizeForContentContribution( const ComputedStyle&); // Convert an inline-axis length to a layout unit using the given constraint @@ -43,7 +44,7 @@ CORE_EXPORT LayoutUnit ResolveInlineLength(const NGConstraintSpace&, const ComputedStyle&, - const WTF::Optional<MinAndMaxContentSizes>&, + const WTF::Optional<MinMaxContentSize>&, const Length&, LengthResolveType); @@ -62,9 +63,9 @@ // to zero) and that an auto inline size resolves to the respective min/max // content size. // Also, the min/max contribution does include the inline margins as well. -CORE_EXPORT MinAndMaxContentSizes ComputeMinAndMaxContentContribution( - const ComputedStyle&, - const WTF::Optional<MinAndMaxContentSizes>&); +CORE_EXPORT MinMaxContentSize +ComputeMinAndMaxContentContribution(const ComputedStyle&, + const WTF::Optional<MinMaxContentSize>&); // Resolves the given length to a layout unit, constraining it by the min // logical width and max logical width properties from the ComputedStyle @@ -72,7 +73,7 @@ CORE_EXPORT LayoutUnit ComputeInlineSizeForFragment(const NGConstraintSpace&, const ComputedStyle&, - const WTF::Optional<MinAndMaxContentSizes>&); + const WTF::Optional<MinMaxContentSize>&); // Resolves the given length to a layout unit, constraining it by the min // logical height and max logical height properties from the ComputedStyle
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc index e8b40a24..097b988c 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
@@ -9,7 +9,6 @@ #include "core/layout/ng/ng_constraint_space_builder.h" #include "core/layout/ng/ng_fragment_builder.h" #include "core/layout/ng/ng_physical_box_fragment.h" -#include "core/layout/ng/ng_units.h" #include "core/style/ComputedStyle.h" #include "platform/CalculationValue.h" #include "platform/LayoutUnit.h" @@ -42,7 +41,7 @@ LayoutUnit ResolveInlineLength( const Length& length, LengthResolveType type = LengthResolveType::kContentSize, - const WTF::Optional<MinAndMaxContentSizes>& sizes = WTF::nullopt) { + const WTF::Optional<MinMaxContentSize>& sizes = WTF::nullopt) { RefPtr<NGConstraintSpace> constraintSpace = ConstructConstraintSpace(200, 300); return ::blink::ResolveInlineLength(*constraintSpace, *style_, sizes, @@ -62,7 +61,7 @@ LayoutUnit ComputeInlineSizeForFragment( RefPtr<const NGConstraintSpace> constraintSpace = ConstructConstraintSpace(200, 300), - const MinAndMaxContentSizes& sizes = MinAndMaxContentSizes()) { + const MinMaxContentSize& sizes = MinMaxContentSize()) { return ::blink::ComputeInlineSizeForFragment(*constraintSpace, *style_, sizes); } @@ -90,7 +89,7 @@ ResolveInlineLength(Length(Auto), LengthResolveType::kMaxSize)); EXPECT_EQ(LayoutUnit(200), ResolveInlineLength(Length(FillAvailable), LengthResolveType::kMaxSize)); - MinAndMaxContentSizes sizes; + MinMaxContentSize sizes; sizes.min_content = LayoutUnit(30); sizes.max_content = LayoutUnit(40); EXPECT_EQ(LayoutUnit(30), @@ -126,18 +125,18 @@ } TEST_F(NGLengthUtilsTest, testComputeContentContribution) { - MinAndMaxContentSizes sizes; + MinMaxContentSize sizes; sizes.min_content = LayoutUnit(30); sizes.max_content = LayoutUnit(40); - MinAndMaxContentSizes expected{LayoutUnit(), LayoutUnit()}; + MinMaxContentSize expected{LayoutUnit(), LayoutUnit()}; style_->setLogicalWidth(Length(30, Percent)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); style_->setLogicalWidth(Length(FillAvailable)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(150), LayoutUnit(150)}; + expected = MinMaxContentSize{LayoutUnit(150), LayoutUnit(150)}; style_->setLogicalWidth(Length(150, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); @@ -145,39 +144,39 @@ style_->setLogicalWidth(Length(Auto)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(430), LayoutUnit(440)}; + expected = MinMaxContentSize{LayoutUnit(430), LayoutUnit(440)}; style_->setPaddingLeft(Length(400, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(100), LayoutUnit(100)}; + expected = MinMaxContentSize{LayoutUnit(100), LayoutUnit(100)}; style_->setPaddingLeft(Length(0, Fixed)); style_->setLogicalWidth(Length(CalculationValue::create( PixelsAndPercent(100, -10), ValueRangeNonNegative))); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(30), LayoutUnit(35)}; + expected = MinMaxContentSize{LayoutUnit(30), LayoutUnit(35)}; style_->setLogicalWidth(Length(Auto)); style_->setMaxWidth(Length(35, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(80), LayoutUnit(80)}; + expected = MinMaxContentSize{LayoutUnit(80), LayoutUnit(80)}; style_->setLogicalWidth(Length(50, Fixed)); style_->setMinWidth(Length(80, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(150), LayoutUnit(150)}; + expected = MinMaxContentSize{LayoutUnit(150), LayoutUnit(150)}; style_ = ComputedStyle::create(); style_->setLogicalWidth(Length(100, Fixed)); style_->setPaddingLeft(Length(50, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(100), LayoutUnit(100)}; + expected = MinMaxContentSize{LayoutUnit(100), LayoutUnit(100)}; style_->setBoxSizing(EBoxSizing::kBorderBox); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); // Content size should never be below zero, even with box-sizing: border-box // and a large padding... - expected = MinAndMaxContentSizes{LayoutUnit(400), LayoutUnit(400)}; + expected = MinMaxContentSize{LayoutUnit(400), LayoutUnit(400)}; style_->setPaddingLeft(Length(400, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); @@ -189,15 +188,15 @@ style_->setMaxWidth(Length(MaxContent)); // Due to padding and box-sizing, width computes to 400px and max-width to // 440px, so the result is 400. - expected = MinAndMaxContentSizes{LayoutUnit(400), LayoutUnit(400)}; + expected = MinMaxContentSize{LayoutUnit(400), LayoutUnit(400)}; EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); - expected = MinAndMaxContentSizes{LayoutUnit(40), LayoutUnit(40)}; + expected = MinMaxContentSize{LayoutUnit(40), LayoutUnit(40)}; style_->setPaddingLeft(Length(0, Fixed)); EXPECT_EQ(expected, ComputeMinAndMaxContentContribution(*style_, sizes)); } TEST_F(NGLengthUtilsTest, testComputeInlineSizeForFragment) { - MinAndMaxContentSizes sizes; + MinMaxContentSize sizes; sizes.min_content = LayoutUnit(30); sizes.max_content = LayoutUnit(40);
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_line_builder.cc b/third_party/WebKit/Source/core/layout/ng/ng_line_builder.cc index 3d37cbc..40fcb42 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_line_builder.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_line_builder.cc
@@ -14,7 +14,6 @@ #include "core/layout/ng/ng_inline_node.h" #include "core/layout/ng/ng_length_utils.h" #include "core/layout/ng/ng_text_fragment.h" -#include "core/layout/ng/ng_units.h" #include "core/style/ComputedStyle.h" #include "platform/text/BidiRunList.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h b/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h index 2727f04..fb5651b 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h
@@ -6,8 +6,8 @@ #define NGLineBuilder_h #include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_logical_offset.h" #include "core/layout/ng/ng_physical_fragment.h" -#include "core/layout/ng/ng_units.h" #include "platform/fonts/FontBaseline.h" #include "platform/heap/Handle.h" #include "wtf/Vector.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size.cc b/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size.cc new file mode 100644 index 0000000..7029da6 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size.cc
@@ -0,0 +1,22 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/ng_min_max_content_size.h" + +namespace blink { + +LayoutUnit MinMaxContentSize::ShrinkToFit(LayoutUnit available_size) const { + DCHECK_GE(max_content, min_content); + return std::min(max_content, std::max(min_content, available_size)); +} + +bool MinMaxContentSize::operator==(const MinMaxContentSize& other) const { + return min_content == other.min_content && max_content == other.max_content; +} + +std::ostream& operator<<(std::ostream& stream, const MinMaxContentSize& value) { + return stream << "(" << value.min_content << ", " << value.max_content << ")"; +} + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size.h b/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size.h new file mode 100644 index 0000000..2fb0a93 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size.h
@@ -0,0 +1,25 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef MinMaxContentSize_h +#define MinMaxContentSize_h + +#include "core/CoreExport.h" +#include "core/layout/ng/ng_writing_mode.h" +#include "platform/LayoutUnit.h" + +namespace blink { + +struct CORE_EXPORT MinMaxContentSize { + LayoutUnit min_content; + LayoutUnit max_content; + LayoutUnit ShrinkToFit(LayoutUnit available_size) const; + bool operator==(const MinMaxContentSize& other) const; +}; + +CORE_EXPORT std::ostream& operator<<(std::ostream&, const MinMaxContentSize&); + +} // namespace blink + +#endif // MinMaxContentSize_h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size_test.cc new file mode 100644 index 0000000..04eea50 --- /dev/null +++ b/third_party/WebKit/Source/core/layout/ng/ng_min_max_content_size_test.cc
@@ -0,0 +1,31 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/layout/ng/ng_min_max_content_size.h" + +#include "testing/gtest/include/gtest/gtest.h" + +namespace blink { + +namespace { + +TEST(NGUnitsTest, ShrinkToFit) { + MinMaxContentSize sizes; + + sizes.min_content = LayoutUnit(100); + sizes.max_content = LayoutUnit(200); + EXPECT_EQ(LayoutUnit(200), sizes.ShrinkToFit(LayoutUnit(300))); + + sizes.min_content = LayoutUnit(100); + sizes.max_content = LayoutUnit(300); + EXPECT_EQ(LayoutUnit(200), sizes.ShrinkToFit(LayoutUnit(200))); + + sizes.min_content = LayoutUnit(200); + sizes.max_content = LayoutUnit(300); + EXPECT_EQ(LayoutUnit(200), sizes.ShrinkToFit(LayoutUnit(100))); +} + +} // namespace + +} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc index 32d792c..5e0d4460f 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc
@@ -106,7 +106,7 @@ static_position.offset -= container_border_physical_offset_; // The inline and block estimates are in the descendant's writing mode. - Optional<MinAndMaxContentSizes> inline_estimate; + Optional<MinMaxContentSize> inline_estimate; Optional<LayoutUnit> block_estimate; RefPtr<NGLayoutResult> layout_result = nullptr; @@ -114,7 +114,7 @@ FromPlatformWritingMode(descendant.Style().getWritingMode())); if (AbsoluteNeedsChildInlineSize(descendant.Style())) { - inline_estimate = descendant.ComputeMinAndMaxContentSizes(); + inline_estimate = descendant.ComputeMinMaxContentSize(); } NGAbsolutePhysicalPosition node_position =
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.h b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.h index 6de47bd..e563e7d 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.h
@@ -10,7 +10,6 @@ #include "core/layout/ng/ng_absolute_utils.h" #include "core/layout/ng/ng_constraint_space.h" #include "core/layout/ng/ng_layout_algorithm.h" -#include "core/layout/ng/ng_units.h" #include "platform/heap/Handle.h" #include "wtf/Optional.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.h b/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.h index 4b03b69..7d6bfed 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_physical_box_fragment.h
@@ -6,8 +6,9 @@ #define NGPhysicalBoxFragment_h #include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_logical_offset.h" +#include "core/layout/ng/geometry/ng_margin_strut.h" #include "core/layout/ng/ng_physical_fragment.h" -#include "core/layout/ng/ng_units.h" #include "platform/heap/Handle.h" #include "wtf/Optional.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_physical_fragment.h b/third_party/WebKit/Source/core/layout/ng/ng_physical_fragment.h index cea8301f..146fa785 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_physical_fragment.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_physical_fragment.h
@@ -6,8 +6,9 @@ #define NGPhysicalFragment_h #include "core/CoreExport.h" +#include "core/layout/ng/geometry/ng_physical_offset.h" +#include "core/layout/ng/geometry/ng_physical_size.h" #include "core/layout/ng/ng_break_token.h" -#include "core/layout/ng/ng_units.h" #include "platform/LayoutUnit.h" #include "platform/heap/Handle.h" #include "wtf/RefPtr.h"
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_units.cc b/third_party/WebKit/Source/core/layout/ng/ng_units.cc deleted file mode 100644 index 4eafda9c..0000000 --- a/third_party/WebKit/Source/core/layout/ng/ng_units.cc +++ /dev/null
@@ -1,161 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "core/layout/ng/ng_units.h" - -namespace blink { - -LayoutUnit MinAndMaxContentSizes::ShrinkToFit(LayoutUnit available_size) const { - DCHECK_GE(max_content, min_content); - return std::min(max_content, std::max(min_content, available_size)); -} - -bool MinAndMaxContentSizes::operator==( - const MinAndMaxContentSizes& other) const { - return min_content == other.min_content && max_content == other.max_content; -} - - -bool NGLogicalRect::IsEmpty() const { - // TODO(layout-dev): equality check shouldn't allocate an object each time. - return *this == NGLogicalRect(); -} - -bool NGLogicalRect::IsContained(const NGLogicalRect& other) const { - return !(InlineEndOffset() <= other.InlineStartOffset() || - BlockEndOffset() <= other.BlockStartOffset() || - InlineStartOffset() >= other.InlineEndOffset() || - BlockStartOffset() >= other.BlockEndOffset()); -} - -bool NGLogicalRect::operator==(const NGLogicalRect& other) const { - return std::tie(other.offset, other.size) == std::tie(offset, size); -} - -String NGLogicalRect::ToString() const { - return String::format("%s,%s %sx%s", - offset.inline_offset.toString().ascii().data(), - offset.block_offset.toString().ascii().data(), - size.inline_size.toString().ascii().data(), - size.block_size.toString().ascii().data()); -} - - -bool NGBoxStrut::IsEmpty() const { - return *this == NGBoxStrut(); -} - -bool NGBoxStrut::operator==(const NGBoxStrut& other) const { - return std::tie(other.inline_start, other.inline_end, other.block_start, - other.block_end) == - std::tie(inline_start, inline_end, block_start, block_end); -} - -// Converts physical dimensions to logical ones per -// https://drafts.csswg.org/css-writing-modes-3/#logical-to-physical -NGBoxStrut NGPhysicalBoxStrut::ConvertToLogical(NGWritingMode writing_mode, - TextDirection direction) const { - NGBoxStrut strut; - switch (writing_mode) { - case kHorizontalTopBottom: - strut = {left, right, top, bottom}; - break; - case kVerticalRightLeft: - case kSidewaysRightLeft: - strut = {top, bottom, right, left}; - break; - case kVerticalLeftRight: - strut = {top, bottom, left, right}; - break; - case kSidewaysLeftRight: - strut = {bottom, top, left, right}; - break; - } - if (direction == TextDirection::kRtl) - std::swap(strut.inline_start, strut.inline_end); - return strut; -} - -LayoutUnit NGMarginStrut::Sum() const { - return margin + negative_margin; -} - -bool NGMarginStrut::operator==(const NGMarginStrut& other) const { - return margin == other.margin && negative_margin == other.negative_margin; -} - -void NGMarginStrut::Append(const LayoutUnit& value) { - if (value < 0) { - negative_margin = std::min(value, negative_margin); - } else { - margin = std::max(value, margin); - } -} - -String NGMarginStrut::ToString() const { - return String::format("%d %d", margin.toInt(), negative_margin.toInt()); -} - -bool NGExclusion::operator==(const NGExclusion& other) const { - return std::tie(other.rect, other.type) == std::tie(rect, type); -} - -String NGExclusion::ToString() const { - return String::format("Rect: %s Type: %d", rect.ToString().ascii().data(), - type); -} - -NGExclusions::NGExclusions() - : last_left_float(nullptr), last_right_float(nullptr) {} - -NGExclusions::NGExclusions(const NGExclusions& other) { - for (const auto& exclusion : other.storage) - Add(*exclusion); -} - -void NGExclusions::Add(const NGExclusion& exclusion) { - storage.push_back(WTF::makeUnique<NGExclusion>(exclusion)); - if (exclusion.type == NGExclusion::kFloatLeft) { - last_left_float = storage.rbegin()->get(); - } else if (exclusion.type == NGExclusion::kFloatRight) { - last_right_float = storage.rbegin()->get(); - } -} - -inline NGExclusions& NGExclusions::operator=(const NGExclusions& other) { - storage.clear(); - last_left_float = nullptr; - last_right_float = nullptr; - for (const auto& exclusion : other.storage) - Add(*exclusion); - return *this; -} - -NGStaticPosition NGStaticPosition::Create(NGWritingMode writing_mode, - TextDirection direction, - NGPhysicalOffset offset) { - NGStaticPosition position; - position.offset = offset; - switch (writing_mode) { - case kHorizontalTopBottom: - position.type = (direction == TextDirection::kLtr) ? kTopLeft : kTopRight; - break; - case kVerticalRightLeft: - case kSidewaysRightLeft: - position.type = - (direction == TextDirection::kLtr) ? kTopRight : kBottomRight; - break; - case kVerticalLeftRight: - position.type = - (direction == TextDirection::kLtr) ? kTopLeft : kBottomLeft; - break; - case kSidewaysLeftRight: - position.type = - (direction == TextDirection::kLtr) ? kBottomLeft : kTopLeft; - break; - } - return position; -} - -} // namespace blink
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_units.h b/third_party/WebKit/Source/core/layout/ng/ng_units.h deleted file mode 100644 index 58c9257..0000000 --- a/third_party/WebKit/Source/core/layout/ng/ng_units.h +++ /dev/null
@@ -1,268 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef NGUnits_h -#define NGUnits_h - -#include "core/CoreExport.h" -#include "core/layout/ng/geometry/ng_logical_offset.h" -#include "core/layout/ng/geometry/ng_logical_size.h" -#include "core/layout/ng/geometry/ng_physical_location.h" -#include "core/layout/ng/geometry/ng_physical_offset.h" -#include "core/layout/ng/geometry/ng_physical_rect.h" -#include "core/layout/ng/geometry/ng_physical_size.h" -#include "core/layout/ng/ng_writing_mode.h" -#include "platform/LayoutUnit.h" -#include "platform/text/TextDirection.h" -#include "wtf/text/WTFString.h" - -namespace blink { - -struct NGBoxStrut; - -#define NGSizeIndefinite LayoutUnit(-1) - -struct CORE_EXPORT MinAndMaxContentSizes { - LayoutUnit min_content; - LayoutUnit max_content; - LayoutUnit ShrinkToFit(LayoutUnit available_size) const; - bool operator==(const MinAndMaxContentSizes& other) const; -}; - -inline std::ostream& operator<<(std::ostream& stream, - const MinAndMaxContentSizes& value) { - return stream << "(" << value.min_content << ", " << value.max_content << ")"; -} - -// TODO(glebl): move to a separate file in layout/ng/units. -struct CORE_EXPORT NGLogicalRect { - NGLogicalRect() {} - NGLogicalRect(const NGLogicalOffset& offset, const NGLogicalSize& size) - : offset(offset), size(size) {} - NGLogicalRect(LayoutUnit inline_offset, - LayoutUnit block_offset, - LayoutUnit inline_size, - LayoutUnit block_size) - : offset(inline_offset, block_offset), size(inline_size, block_size) {} - - bool IsEmpty() const; - - // Whether this rectangle is contained by the provided rectangle. - bool IsContained(const NGLogicalRect& other) const; - - String ToString() const; - bool operator==(const NGLogicalRect& other) const; - - // Getters - LayoutUnit InlineStartOffset() const { return offset.inline_offset; } - - LayoutUnit InlineEndOffset() const { - return offset.inline_offset + size.inline_size; - } - - LayoutUnit BlockStartOffset() const { return offset.block_offset; } - - LayoutUnit BlockEndOffset() const { - return offset.block_offset + size.block_size; - } - - LayoutUnit BlockSize() const { return size.block_size; } - - LayoutUnit InlineSize() const { return size.inline_size; } - - NGLogicalOffset offset; - NGLogicalSize size; -}; - -inline std::ostream& operator<<(std::ostream& stream, - const NGLogicalRect& value) { - return stream << value.ToString(); -} - -// Struct that represents NG exclusion. -struct CORE_EXPORT NGExclusion { - // Type of NG exclusion. - enum Type { - // Undefined exclusion type. - // At this moment it's also used to represent CSS3 exclusion. - kExclusionTypeUndefined = 0, - // Exclusion that is created by LEFT float. - kFloatLeft = 1, - // Exclusion that is created by RIGHT float. - kFloatRight = 2 - }; - - // Rectangle in logical coordinates the represents this exclusion. - NGLogicalRect rect; - - // Type of this exclusion. - Type type; - - bool operator==(const NGExclusion& other) const; - String ToString() const; -}; - -inline std::ostream& operator<<(std::ostream& stream, - const NGExclusion& value) { - return stream << value.ToString(); -} - -struct CORE_EXPORT NGExclusions { - // Default constructor. - NGExclusions(); - - // Copy constructor. - NGExclusions(const NGExclusions& other); - - Vector<std::unique_ptr<const NGExclusion>> storage; - - // Last left/right float exclusions are used to enforce the top edge alignment - // rule for floats and for the support of CSS "clear" property. - const NGExclusion* last_left_float; // Owned by storage. - const NGExclusion* last_right_float; // Owned by storage. - - NGExclusions& operator=(const NGExclusions& other); - - void Add(const NGExclusion& exclusion); -}; - - -// Struct to store physical dimensions, independent of writing mode and -// direction. -// See https://drafts.csswg.org/css-writing-modes-3/#abstract-box -struct CORE_EXPORT NGPhysicalBoxStrut { - LayoutUnit left; - LayoutUnit right; - LayoutUnit top; - LayoutUnit bottom; - NGBoxStrut ConvertToLogical(NGWritingMode, TextDirection) const; -}; - -// This struct is used for storing margins, borders or padding of a box on all -// four edges. -struct CORE_EXPORT NGBoxStrut { - LayoutUnit inline_start; - LayoutUnit inline_end; - LayoutUnit block_start; - LayoutUnit block_end; - - LayoutUnit InlineSum() const { return inline_start + inline_end; } - LayoutUnit BlockSum() const { return block_start + block_end; } - - bool IsEmpty() const; - - // The following two operators exist primarily to have an easy way to access - // the sum of border and padding. - NGBoxStrut& operator+=(const NGBoxStrut& other) { - inline_start += other.inline_start; - inline_end += other.inline_end; - block_start += other.block_start; - block_end += other.block_end; - return *this; - } - - NGBoxStrut operator+(const NGBoxStrut& other) { - NGBoxStrut result(*this); - result += other; - return result; - } - - bool operator==(const NGBoxStrut& other) const; - - String ToString() const { - return String::format("Inline: (%d %d) Block: (%d %d)", - inline_start.toInt(), inline_end.toInt(), - block_start.toInt(), block_end.toInt()); - } -}; - -inline std::ostream& operator<<(std::ostream& stream, const NGBoxStrut& value) { - return stream << value.ToString(); -} - -// This struct is used for the margin collapsing calculation. -struct CORE_EXPORT NGMarginStrut { - LayoutUnit margin; - LayoutUnit negative_margin; - - // Appends negative or positive value to the current margin strut. - void Append(const LayoutUnit& value); - - // Sum up negative and positive margins of this strut. - LayoutUnit Sum() const; - - bool operator==(const NGMarginStrut& other) const; - - String ToString() const; -}; - -inline std::ostream& operator<<(std::ostream& stream, - const NGMarginStrut& value) { - return stream << value.ToString(); -} - -// Struct to represent a simple edge that has start and end. -struct NGEdge { - LayoutUnit start; - LayoutUnit end; -}; - -// Represents static position of an out of flow descendant. -struct CORE_EXPORT NGStaticPosition { - enum Type { kTopLeft, kTopRight, kBottomLeft, kBottomRight }; - - Type type; // Logical corner that corresponds to physical top left. - NGPhysicalOffset offset; - - // Creates a position with proper type wrt writing mode and direction. - static NGStaticPosition Create(NGWritingMode, - TextDirection, - NGPhysicalOffset); - // Left/Right/TopPosition functions map static position to - // left/right/top edge wrt container space. - // The function arguments are required to solve the equation: - // contaner_size = left + margin_left + width + margin_right + right - LayoutUnit LeftPosition(LayoutUnit container_size, - LayoutUnit width, - LayoutUnit margin_left, - LayoutUnit margin_right) const { - return GenericPosition(HasLeft(), offset.left, container_size, width, - margin_left, margin_right); - } - LayoutUnit RightPosition(LayoutUnit container_size, - LayoutUnit width, - LayoutUnit margin_left, - LayoutUnit margin_right) const { - return GenericPosition(!HasLeft(), offset.left, container_size, width, - margin_left, margin_right); - } - LayoutUnit TopPosition(LayoutUnit container_size, - LayoutUnit height, - LayoutUnit margin_top, - LayoutUnit margin_bottom) const { - return GenericPosition(HasTop(), offset.top, container_size, height, - margin_top, margin_bottom); - } - - private: - bool HasTop() const { return type == kTopLeft || type == kTopRight; } - bool HasLeft() const { return type == kTopLeft || type == kBottomLeft; } - LayoutUnit GenericPosition(bool position_matches, - LayoutUnit position, - LayoutUnit container_size, - LayoutUnit length, - LayoutUnit margin_start, - LayoutUnit margin_end) const { - DCHECK_GE(container_size, LayoutUnit()); - DCHECK_GE(length, LayoutUnit()); - if (position_matches) - return position; - else - return container_size - position - length - margin_start - margin_end; - } -}; - -} // namespace blink - -#endif // NGUnits_h
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp index 63a9561..b894172 100644 --- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp +++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
@@ -472,7 +472,9 @@ numFamilies = fontMgr->countFamilies(); } - debug::alias(&fontDescription); + FontDescription fontDescriptionCopy = *fontDescription; + debug::alias(&fontDescriptionCopy); + debug::alias(&fontCache); debug::alias(&fontMgr); debug::alias(&numFamilies);