chromium/src
0
Fork 0
Code Activity

Revert "chromeos: Move files in //ash/common to //ash, part 2"

Browse Source 
Landing this right after the M58 branch will complicate backports. I'm
going to land it right before the M59 branch.

This reverts commit 775aa60705.

Original description:
Now that mustash can use standard aura windows we don't need the ash/aura
vs. ash/mus vs. ash/common distinction. Eliminate //ash/common. Also move
files in //ash/common/system/chromeos out to //ash/system because ash only
compiles on chromeos these days.

Part 2 moves a subset of //ash/common into //ash. The CQ cannot move
all the files at once, see https://codereview.chromium.org/2734653002/

BUG=690096
TEST=compiles, ash_unittests
TBR=oshima@chromium.org

Review-Url: https://codereview.chromium.org/2734683002
Cr-Original-Commit-Position: refs/heads/master@{#454791}
Review-Url: https://codereview.chromium.org/2734753002 .
Cr-Commit-Position: refs/heads/master@{#454798}
This commit is contained in:
James Cook
2017-03-05 14:02:58 -08:00
parent 6316a55cb9
commit 643b718269
588 changed files with 1904 additions and 1895 deletions
ash
BUILD.gn
accelerators
accelerator_commands_aura.ccaccelerator_commands_unittest.ccaccelerator_controller_delegate_aura.ccaccelerator_controller_delegate_aura.haccelerator_controller_unittest.ccaccelerator_delegate.ccaccelerator_filter_unittest.ccaccelerator_interactive_uitest_chromeos.cc
app_list
app_list_delegate_impl.ccapp_list_presenter_delegate.ccapp_list_presenter_delegate.h
aura
wm_shell_aura.cc
autoclick
autoclick_controller.cc
common
accelerators
accelerator_commands.ccaccelerator_commands.haccelerator_controller.ccaccelerator_controller.haccelerator_controller_delegate.haccelerator_router.ccaccelerator_router.haccelerator_table.ccaccelerator_table.haccelerator_table_unittest.ccash_focus_manager_factory.ccash_focus_manager_factory.hdebug_commands.ccdebug_commands.hexit_warning_handler.ccexit_warning_handler.h
devtools
ash_devtools_unittest.cc
drag_drop
OWNERSdrag_image_view.ccdrag_image_view.hdrag_image_view_unittest.cc
focus_cycler.cc
frame
OWNERS
caption_buttons
caption_button_types.hframe_caption_button.ccframe_caption_button.hframe_caption_button_container_view.ccframe_caption_button_container_view.hframe_caption_button_container_view_unittest.ccframe_size_button.ccframe_size_button.hframe_size_button_delegate.h
custom_frame_view_ash.cccustom_frame_view_ash.hcustom_frame_view_ash_unittest.ccdefault_header_painter.ccdefault_header_painter.hdefault_header_painter_unittest.ccframe_border_hit_test.ccframe_border_hit_test.hheader_painter.hheader_painter_util.ccheader_painter_util.hheader_view.ccheader_view.h
metrics
OWNERSgesture_action_type.hpointer_metrics_recorder.ccpointer_metrics_recorder.hpointer_metrics_recorder_unittest.cctask_switch_source.huser_metrics_action.h
mojo_interface_factory.ccmus_property_mirror_ash_unittest.cc
shelf
app_list_button.ccapp_list_button.happ_list_shelf_item_delegate.ccapp_list_shelf_item_delegate.hink_drop_button_listener.hoverflow_bubble.ccoverflow_bubble.hoverflow_bubble_view.ccoverflow_bubble_view.hoverflow_button.ccoverflow_button.hshelf_alignment_menu.ccshelf_alignment_menu.hshelf_application_menu_model.ccshelf_application_menu_model.hshelf_application_menu_model_unittest.ccshelf_background_animator.ccshelf_background_animator.hshelf_background_animator_observer.hshelf_background_animator_unittest.ccshelf_button.ccshelf_button.hshelf_button_pressed_metric_tracker.ccshelf_button_pressed_metric_tracker.hshelf_button_pressed_metric_tracker_unittest.ccshelf_constants.ccshelf_constants.hshelf_controller.ccshelf_controller.hshelf_delegate.hshelf_item_delegate.ccshelf_item_delegate.hshelf_item_types.ccshelf_item_types.hshelf_layout_manager.ccshelf_layout_manager.hshelf_layout_manager_observer.hshelf_locking_manager.ccshelf_locking_manager.hshelf_locking_manager_unittest.ccshelf_model.ccshelf_model.hshelf_model_observer.hshelf_model_unittest.ccshelf_tooltip_manager.ccshelf_tooltip_manager.hshelf_tooltip_manager_unittest.ccshelf_view.ccshelf_view.hshelf_widget.ccshelf_widget.hshelf_window_watcher.ccshelf_window_watcher.hshelf_window_watcher_item_delegate.ccshelf_window_watcher_item_delegate.hshelf_window_watcher_unittest.ccwm_shelf.ccwm_shelf.hwm_shelf_observer.hwm_shelf_util.ccwm_shelf_util.h
test
ash_test.ccash_test.hash_test_impl.htest_palette_delegate.cctest_palette_delegate.htest_session_state_delegate.cctest_session_state_delegate.htest_shelf_delegate.cctest_shelf_delegate.htest_shelf_item_delegate.cctest_shelf_item_delegate.htest_system_tray_delegate.cctest_system_tray_delegate.hwm_shell_test_api.ccwm_shell_test_api.hworkspace_event_handler_test_helper.ccworkspace_event_handler_test_helper.h
wallpaper
wallpaper_view.cc
wm
OWNERSalways_on_top_controller.ccalways_on_top_controller.hcontainer_finder.cccontainer_finder.hcontainer_finder_unittest.ccdefault_state.ccdefault_state.hdefault_window_resizer.ccdefault_window_resizer.h
dock
dock_types.hdocked_window_layout_manager.ccdocked_window_layout_manager.hdocked_window_layout_manager_observer.hdocked_window_resizer.ccdocked_window_resizer.h
drag_details.ccdrag_details.hfocus_rules.ccfocus_rules.hfullscreen_window_finder.ccfullscreen_window_finder.himmersive_context_ash.ccimmersive_context_ash.hlock_layout_manager.cclock_layout_manager.hlock_state_observer.hlock_window_state.cclock_window_state.h
maximize_mode
OWNERSmaximize_mode_controller.ccmaximize_mode_controller.hmaximize_mode_event_handler.ccmaximize_mode_event_handler.hmaximize_mode_window_manager.ccmaximize_mode_window_manager.hmaximize_mode_window_state.ccmaximize_mode_window_state.hscoped_disable_internal_mouse_and_keyboard.hworkspace_backdrop_delegate.ccworkspace_backdrop_delegate.h
mru_window_tracker.ccmru_window_tracker.hmru_window_tracker_unittest.cc
overview
cleanup_animation_observer.cccleanup_animation_observer.hcleanup_animation_observer_unittest.ccoverview_animation_type.hscoped_overview_animation_settings.hscoped_overview_animation_settings_factory.ccscoped_overview_animation_settings_factory.hscoped_transform_overview_window.ccscoped_transform_overview_window.hwindow_grid.ccwindow_grid.hwindow_selector.ccwindow_selector.hwindow_selector_controller.ccwindow_selector_controller.hwindow_selector_delegate.hwindow_selector_item.ccwindow_selector_item.h
panels
OWNERSpanel_frame_view.ccpanel_frame_view.hpanel_layout_manager.ccpanel_layout_manager.hpanel_window_resizer.ccpanel_window_resizer.h
root_window_finder.ccroot_window_finder.hroot_window_layout_manager.ccroot_window_layout_manager.hscreen_dimmer.ccscreen_dimmer.hswitchable_windows.ccswitchable_windows.hsystem_modal_container_layout_manager.ccsystem_modal_container_layout_manager.hwindow_animation_types.hwindow_cycle_controller.ccwindow_cycle_controller.hwindow_cycle_event_filter.hwindow_cycle_list.ccwindow_cycle_list.hwindow_dimmer.ccwindow_dimmer.hwindow_parenting_utils.ccwindow_parenting_utils.hwindow_positioner.ccwindow_positioner.hwindow_positioning_utils.ccwindow_positioning_utils.hwindow_resizer.ccwindow_resizer.hwindow_state.ccwindow_state.hwindow_state_delegate.ccwindow_state_delegate.hwindow_state_observer.hwindow_state_util.ccwindow_state_util.hwm_event.ccwm_event.hwm_screen_util.ccwm_screen_util.hwm_snap_to_pixel_layout_manager.ccwm_snap_to_pixel_layout_manager.hwm_toplevel_window_event_handler.ccwm_toplevel_window_event_handler.hwm_types.ccwm_types.hwm_window_animations.ccwm_window_animations.h
workspace
magnetism_matcher.ccmagnetism_matcher.hmulti_window_resize_controller.ccmulti_window_resize_controller.hphantom_window_controller.ccphantom_window_controller.htwo_step_edge_cycler.cctwo_step_edge_cycler.hworkspace_event_handler.ccworkspace_event_handler.hworkspace_layout_manager.ccworkspace_layout_manager.hworkspace_layout_manager_backdrop_delegate.hworkspace_layout_manager_unittest.ccworkspace_types.hworkspace_window_resizer.ccworkspace_window_resizer.h
workspace_controller.ccworkspace_controller.h
wm_shell.ccwm_shell.hwm_window.ccwm_window_unittest.ccwm_window_user_data_unittest.cc
content
display
screen_orientation_controller_chromeos_unittest.cc
keyboard_overlay
keyboard_overlay_delegate_unittest.cckeyboard_overlay_view_unittest.cc
dip_unittest.cc
display
display_manager_unittest.ccroot_window_transformers_unittest.ccscreen_ash.ccscreen_orientation_controller_chromeos.ccscreen_position_controller.ccwindow_tree_host_manager_unittest.cc
drag_drop
drag_drop_controller.ccdrag_drop_controller_unittest.ccdrag_drop_tracker.cc
extended_desktop_unittest.cc
first_run
first_run_helper_impl.cc
focus_cycler_unittest.cc
frame
caption_buttons
frame_size_button_unittest.cc
magnifier
magnification_controller.cc
metrics
task_switch_metrics_recorder.huser_metrics_recorder.ccuser_metrics_recorder.huser_metrics_recorder_unittest.cc
mus
accelerators
accelerator_controller_delegate_mus.haccelerator_controller_registrar.cc
bridge
wm_shell_mus.ccworkspace_event_handler_mus.h
context_menu_mus.cccontext_menu_mus.hdrag_window_resizer.h
frame
custom_frame_view_mus.hdetached_title_area_renderer.cc
move_event_handler.hnon_client_frame_controller.ccscreen_mus.ccshelf_delegate_mus.ccshelf_delegate_mus.h
test
ash_test_impl_mus.ccash_test_impl_mus.hwm_test_helper.cc
top_level_window_factory.cctop_level_window_factory_unittest.ccwindow_manager.cc
root_window_controller.ccroot_window_controller.hroot_window_controller_unittest.ccscreen_util.ccscreen_util_unittest.cc
shelf
shelf_bezel_event_handler.ccshelf_layout_manager_unittest.ccshelf_unittest.ccshelf_view_unittest.ccshelf_widget_unittest.ccshelf_window_targeter.ccshelf_window_targeter.h
shell.cc
shell
context_menu.cccontext_menu.hpanel_window.ccshell_delegate_impl.cctoplevel_window.ccwindow_watcher.ccwindow_watcher.hwindow_watcher_shelf_item_delegate.h
shell_unittest.cc
system
audio
tray_audio_unittest.ccvolume_view.cc
brightness
tray_brightness.cctray_brightness_unittest.cc
cast
tray_cast.cc
date
date_default_view.ccdate_view_unittest.cctray_date.cctray_system_info.cc
ime_menu
ime_menu_tray.ccime_menu_tray_unittest.cc
media_security
multi_profile_media_tray_item_unittest.cc
network
sms_observer_unittest.cctray_network.cc
overview
overview_button_tray.ccoverview_button_tray_unittest.cc
palette
common_palette_tool.ccpalette_tray.ccpalette_utils.cc
tools
capture_region_mode.cccreate_note_unittest.ccscreenshot_unittest.cc
power
power_event_observer_unittest.cctablet_power_button_controller.cctablet_power_button_controller_unittest.cc
rotation
tray_rotation_lock.cctray_rotation_lock_unittest.cc
screen_layout_observer.ccscreen_layout_observer_unittest.cc
screen_security
screen_capture_tray_item.ccscreen_tray_item.ccscreen_tray_item_unittest.cc
session
logout_button_tray.cctray_session_length_limit_unittest.cc
status_area_layout_manager.ccstatus_area_layout_manager.hstatus_area_widget.ccstatus_area_widget.hstatus_area_widget_delegate.cc
supervised
tray_supervised_user_unittest.cc
tiles
tiles_default_view.cctray_tiles.cc
toast
toast_manager_unittest.cctoast_overlay.cc
tray
system_tray.ccsystem_tray_unittest.cctray_background_view.cctray_background_view.htray_event_filter.cctray_image_item.cctray_item_view.cctray_utils.cc
tray_tracing.cc
update
tray_update.cctray_update_unittest.cc
user
tray_user.cctray_user_unittest.cc
virtual_keyboard
virtual_keyboard_tray.cc
web_notification
ash_popup_alignment_delegate.ccash_popup_alignment_delegate.hash_popup_alignment_delegate_unittest.ccweb_notification_tray.ccweb_notification_tray_unittest.cc
test
BUILD.gnash_test_base.ccash_test_helper.ccash_test_impl_aura.ccash_test_impl_aura.hoverflow_bubble_view_test_api.ccshelf_button_pressed_metric_tracker_test_api.hshelf_view_test_api.ccshelf_view_test_api.htest_shell_delegate.cctest_shell_delegate.hui_controls_factory_ash.cc
touch
touch_uma.h
virtual_keyboard_controller.ccvirtual_keyboard_controller_unittest.cc
wm
always_on_top_controller_unittest.ccash_focus_rules.ccash_focus_rules_unittest.cc
dock
docked_window_layout_manager_unittest.ccdocked_window_resizer_unittest.cc
drag_window_resizer.ccdrag_window_resizer.hdrag_window_resizer_unittest.cc
gestures
overview_gesture_handler.ccoverview_gesture_handler_unittest.cc
immersive_fullscreen_controller_unittest.cclock_layout_manager_unittest.cclock_state_controller_unittest.cc
maximize_mode
maximize_mode_controller_unittest.ccmaximize_mode_event_handler_aura.hmaximize_mode_window_manager_unittest.ccscoped_disable_internal_mouse_and_keyboard_ozone.hscoped_disable_internal_mouse_and_keyboard_x11.h
overview
scoped_overview_animation_settings_aura.hscoped_overview_animation_settings_factory_aura.hwindow_selector_unittest.cc
panels
attached_panel_window_targeter.ccpanel_layout_manager_unittest.ccpanel_window_event_handler.ccpanel_window_resizer_unittest.cc
power_button_controller.ccresize_handle_window_targeter.ccresize_handle_window_targeter.hresize_shadow_and_cursor_unittest.ccscreen_dimmer_unittest.ccscreen_pinning_controller.ccscreen_pinning_controller_unittest.ccsession_state_animator_impl.ccstacking_controller.ccsystem_gesture_event_filter_unittest.ccsystem_modal_container_layout_manager_unittest.cctoplevel_window_event_handler.cctoplevel_window_event_handler.htoplevel_window_event_handler_unittest.ccvideo_detector.ccvideo_detector_unittest.ccwindow_animations.ccwindow_animations_unittest.ccwindow_cycle_controller_unittest.ccwindow_cycle_event_filter_aura.ccwindow_cycle_event_filter_aura.hwindow_mirror_view.ccwindow_positioner_unittest.ccwindow_properties.ccwindow_properties.hwindow_state_aura.ccwindow_state_unittest.ccwindow_util.ccwindow_util_unittest.cc
workspace
magnetism_matcher_unittest.ccmulti_window_resize_controller_unittest.ccworkspace_event_handler_aura.hworkspace_event_handler_unittest.ccworkspace_layout_manager_keyboard_unittest.ccworkspace_window_resizer_unittest.cc
workspace_controller_test_helper.ccworkspace_controller_test_helper.hworkspace_controller_unittest.cc
chrome
browser
chromeos
accessibility
accessibility_manager.ccchromevox_panel.ccspoken_feedback_browsertest.cc
arc
arc_play_store_enabled_preference_handler.ccarc_session_manager.cc
background
ash_wallpaper_delegate.cc
dbus
chrome_display_power_service_provider_delegate.cc
display
display_preferences_unittest.cc
events
event_rewriter.ccevent_rewriter_unittest.cc
extensions
wallpaper_private_api.ccwallpaper_private_api_unittest.cc
first_run
steps
tray_step.cc
login
lock
screen_locker.ccscreen_locker_browsertest.ccwebui_screen_locker.h
login_browsertest.cc
policy
force_maximize_on_first_run_chromeos_browsertest.cc
profiles
multiprofiles_session_aborted_dialog.cc
system
tray_accessibility_browsertest.cc
extensions
api
automation
automation_apitest.cc
bookmark_app_helper.ccdisplay_info_provider_chromeos_unittest.ccglobal_shortcut_listener_chromeos.cc
notifications
fullscreen_notification_blocker.cc
policy
policy_browsertest.cc
ui
apps
chrome_app_delegate.cc
ash
accelerator_commands_browsertest.ccaccelerator_controller_browsertest.cc
app_list
app_list_controller_ash.ccapp_list_interactive_uitest.cc
ash_init.ccash_util.ccchrome_screenshot_grabber_unittest.ccchrome_shell_delegate.cc
launcher
arc_app_launcher_browsertest.ccarc_app_window_launcher_controller.ccarc_launcher_context_menu.ccbrowser_shortcut_launcher_item_controller.ccbrowser_status_monitor.ccchrome_launcher_controller.hchrome_launcher_controller_impl.ccchrome_launcher_controller_impl.hchrome_launcher_controller_impl_browsertest.ccchrome_launcher_controller_impl_unittest.ccextension_app_window_launcher_controller.ccextension_app_window_launcher_item_controller.ccextension_launcher_context_menu.cclauncher_context_menu.cclauncher_context_menu.hlauncher_context_menu_unittest.cclauncher_favicon_loader.cclauncher_favicon_loader_browsertest.cclauncher_item_controller.hmulti_profile_browser_status_monitor.ccsettings_window_observer.cc
multi_user
multi_user_window_manager_chromeos.ccmulti_user_window_manager_chromeos_unittest.ccuser_switch_animator_chromeos.ccuser_switch_util.ccuser_switch_util_unittest.cc
shelf_browsertest.ccwindow_positioner_unittest.cc
toolbar
recent_tabs_sub_menu_model.cc
views
accelerator_table.ccaccelerator_table_unittest.ccaccelerator_utils_aura.cc
apps
app_info_dialog
app_info_footer_panel.cc
chrome_native_app_window_views_aura_ash.cc
chrome_views_delegate_chromeos.cc
frame
browser_frame_ash.ccbrowser_header_painter_ash.ccbrowser_header_painter_ash.hbrowser_non_client_frame_view_ash.ccbrowser_non_client_frame_view_ash_browsertest.ccimmersive_mode_controller_ash.ccimmersive_mode_controller_ash.himmersive_mode_controller_ash_unittest.cc
status_bubble_views.cc
tabs
tab_drag_controller.cctab_drag_controller_interactive_uitest.ccwindow_finder_ash.cc
task_manager_view.cc
webui
chromeos
first_run
first_run_ui.cc
login
oobe_ui.cc
window_sizer
window_sizer.ccwindow_sizer_ash.ccwindow_sizer_ash_uitest.ccwindow_sizer_ash_unittest.ccwindow_sizer_common_unittest.cc
test
base
view_event_test_platform_part_chromeos.cc
components/exo
pointer_unittest.ccshell_surface.ccshell_surface.hshell_surface_unittest.cc
test
exo_test_helper.cc
touch_unittest.ccwm_helper_ash.cc

470
ash/BUILD.gn

@@ -15,27 +15,12 @@ assert(enable_hidpi)
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",
@@ -64,6 +49,21 @@ component("ash") {
"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,8 +80,29 @@ component("ash") {
"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",
@@ -95,6 +116,10 @@ component("ash") {
"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",
@@ -110,6 +135,60 @@ component("ash") {
"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",
@@ -121,6 +200,130 @@ component("ash") {
"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",
@@ -185,33 +388,12 @@ component("ash") {
"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",
@@ -246,14 +428,10 @@ component("ash") {
"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",
@@ -280,64 +458,10 @@ component("ash") {
"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",
@@ -625,107 +749,46 @@ component("ash") {
"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",
@@ -734,12 +797,6 @@ component("ash") {
"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",
@@ -748,88 +805,31 @@ component("ash") {
"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,45 +1153,49 @@ source_set("common_unittests") {
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",
@@ -1233,16 +1237,12 @@ source_set("common_unittests") {
"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",

2
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"

4
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/accelerators/accelerator_commands.h"
#include "ash/common/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"

10
ash/accelerators/accelerator_controller_delegate_aura.cc

@@ -10,10 +10,14 @@
#include <utility>
#include "ash/accelerators/accelerator_commands_aura.h"
#include "ash/accelerators/debug_commands.h"
#include "ash/common/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"
@@ -24,18 +28,14 @@
#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"

2
ash/accelerators/accelerator_controller_delegate_aura.h

@@ -7,7 +7,7 @@
#include <memory>
#include "ash/accelerators/accelerator_controller_delegate.h"
#include "ash/common/accelerators/accelerator_controller_delegate.h"
#include "base/macros.h"
namespace ash {

14
ash/accelerators/accelerator_controller_unittest.cc

@@ -2,14 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ash/accelerators/accelerator_controller.h"
#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_table.h"
#include "ash/common/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"
@@ -21,14 +26,9 @@
#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"

2
ash/accelerators/accelerator_delegate.cc

@@ -4,7 +4,7 @@
#include "ash/accelerators/accelerator_delegate.h"
#include "ash/accelerators/accelerator_router.h"
#include "ash/common/accelerators/accelerator_router.h"
#include "ash/common/wm_window.h"
#include "ui/aura/window.h"
#include "ui/events/event.h"

6
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"

4
ash/accelerators/accelerator_interactive_uitest_chromeos.cc

@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ash/accelerators/accelerator_controller.h"
#include "ash/common/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"
@@ -12,7 +13,6 @@
#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"

6
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 {

12
ash/app_list/app_list_presenter_delegate.cc

@@ -5,6 +5,12 @@
#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"
@@ -12,13 +18,7 @@
#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"

2
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"

6
ash/aura/wm_shell_aura.cc

@@ -11,6 +11,9 @@
#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"
@@ -25,9 +28,6 @@
#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"

2
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"

8
ash/accelerators/accelerator_commands.cc → ash/common/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/accelerators/accelerator_commands.h"
#include "ash/common/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 {

6
ash/accelerators/accelerator_commands.h → ash/common/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_ACCELERATORS_ACCELERATOR_COMMANDS_H_
#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
#include "ash/ash_export.h"
@@ -28,4 +28,4 @@ ASH_EXPORT void ToggleFullscreen();
} // namespace accelerators
} // namespace ash
#endif // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_

24
ash/accelerators/accelerator_controller.cc → ash/common/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/accelerators/accelerator_controller.h"
#include "ash/common/accelerators/accelerator_controller.h"
#include <utility>
#include "ash/accelerators/accelerator_commands.h"
#include "ash/accelerators/accelerator_controller_delegate.h"
#include "ash/accelerators/debug_commands.h"
#include "ash/common/accelerators/accelerator_commands.h"
#include "ash/common/accelerators/accelerator_controller_delegate.h"
#include "ash/common/accelerators/debug_commands.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/focus_cycler.h"
@@ -18,13 +18,19 @@
#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"
@@ -36,12 +42,6 @@
#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"

10
ash/accelerators/accelerator_controller.h → ash/common/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_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
#define ASH_COMMON_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 @@ class ASH_EXPORT AcceleratorController
} // namespace ash
#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_

8
ash/accelerators/accelerator_controller_delegate.h → ash/common/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_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
#define ASH_COMMON_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 @@ class ASH_EXPORT AcceleratorControllerDelegate {
} // namespace ash
#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_

6
ash/accelerators/accelerator_router.cc → ash/common/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/accelerators/accelerator_router.h"
#include "ash/common/accelerators/accelerator_router.h"
#include "ash/accelerators/accelerator_controller.h"
#include "ash/common/accelerators/accelerator_controller.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"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "ui/base/accelerators/accelerator.h"

0
ash/accelerators/accelerator_router.h → ash/common/accelerators/accelerator_router.h

2
ash/accelerators/accelerator_table.cc → ash/common/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/accelerators/accelerator_table.h"
#include "ash/common/accelerators/accelerator_table.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/macros.h"

6
ash/accelerators/accelerator_table.h → ash/common/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_ACCELERATORS_ACCELERATOR_TABLE_H_
#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
#define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
#include <stddef.h>
@@ -261,4 +261,4 @@ ASH_EXPORT extern const size_t kActionsKeepingMenuOpenLength;
} // namespace ash
#endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_

2
ash/accelerators/accelerator_table_unittest.cc → ash/common/accelerators/accelerator_table_unittest.cc

@@ -4,7 +4,7 @@
#include <set>
#include "ash/accelerators/accelerator_table.h"
#include "ash/common/accelerators/accelerator_table.h"
#include "base/strings/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"

4
ash/accelerators/ash_focus_manager_factory.cc → ash/common/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/accelerators/ash_focus_manager_factory.h"
#include "ash/common/accelerators/ash_focus_manager_factory.h"
#include "ash/accelerators/accelerator_controller.h"
#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/wm_shell.h"
#include "base/memory/ptr_util.h"
#include "ui/views/focus/focus_manager.h"

6
ash/accelerators/ash_focus_manager_factory.h → ash/common/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_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
#define ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
#ifndef ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
#define ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
#include "base/macros.h"
#include "ui/views/focus/focus_manager_delegate.h"
@@ -35,4 +35,4 @@ class AshFocusManagerFactory : public views::FocusManagerFactory {
} // namespace ash
#endif // ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
#endif // ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_

6
ash/accelerators/debug_commands.cc → ash/common/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/accelerators/debug_commands.h"
#include "ash/common/accelerators/debug_commands.h"
#include "ash/accelerators/accelerator_commands.h"
#include "ash/common/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"

8
ash/accelerators/debug_commands.h → ash/common/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_ACCELERATORS_DEBUG_COMMANDS_H_
#define ASH_ACCELERATORS_DEBUG_COMMANDS_H_
#ifndef ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
#define ASH_COMMON_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 @@ ASH_EXPORT void PerformDebugActionIfEnabled(AcceleratorAction action);
} // namespace debug
} // namespace ash
#endif // ASH_ACCELERATORS_DEBUG_COMMANDS_H_
#endif // ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_

2
ash/accelerators/exit_warning_handler.cc → ash/common/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/accelerators/exit_warning_handler.h"
#include "ash/common/accelerators/exit_warning_handler.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/wm_shell.h"

6
ash/accelerators/exit_warning_handler.h → ash/common/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_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#ifndef ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#define ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#include <memory>
@@ -81,4 +81,4 @@ class ASH_EXPORT ExitWarningHandler {
} // namespace ash
#endif // ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#endif // ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_

2
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"

1
ash/common/drag_drop/OWNERS Normal file

@@ -0,0 +1 @@
mfomitchev@chromium.org

2
ash/drag_drop/drag_image_view.cc → ash/common/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/drag_drop/drag_image_view.h"
#include "ash/common/drag_drop/drag_image_view.h"
#include <memory>

6
ash/drag_drop/drag_image_view.h → ash/common/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_DRAG_DROP_DRAG_IMAGE_VIEW_H_
#define ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
#ifndef ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_
#define ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_
#include <memory>
@@ -100,4 +100,4 @@ class ASH_EXPORT DragImageView : public views::ImageView {
} // namespace ash
#endif // ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
#endif // ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_

4
ash/drag_drop/drag_image_view_unittest.cc → ash/common/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/drag_drop/drag_image_view.h"
#include "ash/common/drag_drop/drag_image_view.h"
#include "ash/test/ash_test.h"
#include "ash/common/test/ash_test.h"
#include "ui/base/dragdrop/drag_drop_types.h"
namespace ash {

4
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"

1
ash/common/frame/OWNERS Normal file

@@ -0,0 +1 @@
pkotwicz@chromium.org

6
ash/frame/caption_buttons/caption_button_types.h → ash/common/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_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
#define ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
#define ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
namespace ash {
@@ -22,4 +22,4 @@ enum CaptionButtonIcon {
} // namespace ash
#endif // ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_

2
ash/frame/caption_buttons/frame_caption_button.cc → ash/common/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/frame/caption_buttons/frame_caption_button.h"
#include "ash/common/frame/caption_buttons/frame_caption_button.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/animation/throb_animation.h"

8
ash/frame/caption_buttons/frame_caption_button.h → ash/common/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_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#include <memory>
#include "ash/ash_export.h"
#include "ash/frame/caption_buttons/caption_button_types.h"
#include "ash/common/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 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
} // namespace ash
#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_

8
ash/frame/caption_buttons/frame_caption_button_container_view.cc → ash/common/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/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/common/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"

8
ash/frame/caption_buttons/frame_caption_button_container_view.h → ash/common/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_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
#include <map>
#include "ash/ash_export.h"
#include "ash/frame/caption_buttons/frame_size_button_delegate.h"
#include "ash/common/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 @@ class ASH_EXPORT FrameCaptionButtonContainerView
} // namespace ash
#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_

6
ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc → ash/common/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/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/common/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"

10
ash/frame/caption_buttons/frame_size_button.cc → ash/common/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/frame/caption_buttons/frame_size_button.h"
#include "ash/common/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"

10
ash/frame/caption_buttons/frame_size_button.h → ash/common/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_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
#define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
#include <memory>
#include "ash/ash_export.h"
#include "ash/frame/caption_buttons/frame_caption_button.h"
#include "ash/frame/caption_buttons/frame_size_button_delegate.h"
#include "ash/common/frame/caption_buttons/frame_caption_button.h"
#include "ash/common/frame/caption_buttons/frame_size_button_delegate.h"
#include "base/macros.h"
#include "base/timer/timer.h"
@@ -117,4 +117,4 @@ class ASH_EXPORT FrameSizeButton : public FrameCaptionButton {
} // namespace ash
#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_

8
ash/frame/caption_buttons/frame_size_button_delegate.h → ash/common/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_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
#define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
#include "ash/ash_export.h"
#include "ash/frame/caption_buttons/caption_button_types.h"
#include "ash/common/frame/caption_buttons/caption_button_types.h"
namespace gfx {
class Point;
@@ -50,4 +50,4 @@ class ASH_EXPORT FrameSizeButtonDelegate {
} // namespace ash
#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_

14
ash/frame/custom_frame_view_ash.cc → ash/common/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/frame/custom_frame_view_ash.h"
#include "ash/common/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"

6
ash/frame/custom_frame_view_ash.h → ash/common/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_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#ifndef ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#define ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#include <memory>
@@ -111,4 +111,4 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
} // namespace ash
#endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#endif // ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_

10
ash/frame/custom_frame_view_ash_unittest.cc → ash/common/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/frame/custom_frame_view_ash.h"
#include "ash/common/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"

6
ash/frame/default_header_painter.cc → ash/common/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/frame/default_header_painter.h"
#include "ash/common/frame/default_header_painter.h"
#include "ash/common/ash_layout_constants.h"
#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/frame/header_painter_util.h"
#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/common/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"

8
ash/frame/default_header_painter.h → ash/common/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_FRAME_DEFAULT_HEADER_PAINTER_H_
#define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
#ifndef ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
#define ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
#include <memory>
#include "ash/ash_export.h"
#include "ash/frame/header_painter.h"
#include "ash/common/frame/header_painter.h"
#include "base/compiler_specific.h" // override
#include "base/gtest_prod_util.h"
#include "base/macros.h"
@@ -118,4 +118,4 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
} // namespace ash
#endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
#endif // ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_

4
ash/frame/default_header_painter_unittest.cc → ash/common/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/frame/default_header_painter.h"
#include "ash/common/frame/default_header_painter.h"
#include <memory>
#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/common/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"

4
ash/frame/frame_border_hit_test.cc → ash/common/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/frame/frame_border_hit_test.h"
#include "ash/common/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"

6
ash/frame/frame_border_hit_test.h → ash/common/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_FRAME_FRAME_BORDER_HIT_TEST_H_
#define ASH_FRAME_FRAME_BORDER_HIT_TEST_H_
#ifndef ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_
#define ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_
#include "ash/ash_export.h"
@@ -27,4 +27,4 @@ ASH_EXPORT int FrameBorderNonClientHitTest(
} // namespace ash
#endif // ASH_FRAME_FRAME_BORDER_HIT_TEST_H_
#endif // ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_

6
ash/frame/header_painter.h → ash/common/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_FRAME_HEADER_PAINTER_H_
#define ASH_FRAME_HEADER_PAINTER_H_
#ifndef ASH_COMMON_FRAME_HEADER_PAINTER_H_
#define ASH_COMMON_FRAME_HEADER_PAINTER_H_
#include "ash/ash_export.h"
@@ -44,4 +44,4 @@ class ASH_EXPORT HeaderPainter {
} // namespace ash
#endif // ASH_FRAME_HEADER_PAINTER_H_
#endif // ASH_COMMON_FRAME_HEADER_PAINTER_H_

2
ash/frame/header_painter_util.cc → ash/common/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/frame/header_painter_util.h"
#include "ash/common/frame/header_painter_util.h"
#include <algorithm>

6
ash/frame/header_painter_util.h → ash/common/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_FRAME_HEADER_PAINTER_UTIL_H_
#define ASH_FRAME_HEADER_PAINTER_UTIL_H_
#ifndef ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_
#define ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -52,4 +52,4 @@ class ASH_EXPORT HeaderPainterUtil {
} // namespace ash
#endif // ASH_FRAME_HEADER_PAINTER_UTIL_H_
#endif // ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_

6
ash/frame/header_view.cc → ash/common/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/frame/header_view.h"
#include "ash/common/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"

6
ash/frame/header_view.h → ash/common/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_FRAME_HEADER_VIEW_H_
#define ASH_FRAME_HEADER_VIEW_H_
#ifndef ASH_COMMON_FRAME_HEADER_VIEW_H_
#define ASH_COMMON_FRAME_HEADER_VIEW_H_
#include <memory>
@@ -113,4 +113,4 @@ class ASH_EXPORT HeaderView : public views::View,
} // namespace ash
#endif // ASH_FRAME_HEADER_VIEW_H_
#endif // ASH_COMMON_FRAME_HEADER_VIEW_H_

1
ash/common/metrics/OWNERS Normal file

@@ -0,0 +1 @@
tdanderson@chromium.org

6
ash/metrics/gesture_action_type.h → ash/common/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_METRICS_GESTURE_ACTION_TYPE_H_
#define ASH_METRICS_GESTURE_ACTION_TYPE_H_
#ifndef ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_
#define ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_
namespace ash {
@@ -37,4 +37,4 @@ enum GestureActionType {
} // namespace ash
#endif // ASH_METRICS_GESTURE_ACTION_TYPE_H_
#endif // ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_

4
ash/metrics/pointer_metrics_recorder.cc → ash/common/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/metrics/pointer_metrics_recorder.h"
#include "ash/common/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"

6
ash/metrics/pointer_metrics_recorder.h → ash/common/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_METRICS_POINTER_METRICS_RECORDER_H_
#define UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_
#ifndef UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_
#define UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -36,4 +36,4 @@ class ASH_EXPORT PointerMetricsRecorder : public views::PointerWatcher {
} // namespace ash
#endif // UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_
#endif // UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_

4
ash/metrics/pointer_metrics_recorder_unittest.cc → ash/common/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/metrics/pointer_metrics_recorder.h"
#include "ash/common/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"

6
ash/metrics/task_switch_source.h → ash/common/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_METRICS_TASK_SWITCH_SOURCE_H_
#define ASH_METRICS_TASK_SWITCH_SOURCE_H_
#ifndef ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_
#define ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_
namespace ash {
@@ -27,4 +27,4 @@ enum class TaskSwitchSource {
} // namespace ash
#endif // ASH_METRICS_TASK_SWITCH_SOURCE_H_
#endif // ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_

6
ash/metrics/user_metrics_action.h → ash/common/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_METRICS_USER_METRICS_ACTION_H_
#define ASH_METRICS_USER_METRICS_ACTION_H_
#ifndef ASH_COMMON_METRICS_USER_METRICS_ACTION_H_
#define ASH_COMMON_METRICS_USER_METRICS_ACTION_H_
namespace ash {
@@ -147,4 +147,4 @@ enum UserMetricsAction {
} // namespace ash
#endif // ASH_METRICS_USER_METRICS_ACTION_H_
#endif // ASH_COMMON_METRICS_USER_METRICS_ACTION_H_

6
ash/common/mojo_interface_factory.cc

@@ -6,20 +6,20 @@
#include <utility>
#include "ash/accelerators/accelerator_controller.h"
#include "ash/common/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"

2
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"

10
ash/shelf/app_list_button.cc → ash/common/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/shelf/app_list_button.h"
#include "ash/common/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"

6
ash/shelf/app_list_button.h → ash/common/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_SHELF_APP_LIST_BUTTON_H_
#define ASH_SHELF_APP_LIST_BUTTON_H_
#ifndef ASH_COMMON_SHELF_APP_LIST_BUTTON_H_
#define ASH_COMMON_SHELF_APP_LIST_BUTTON_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -69,4 +69,4 @@ class ASH_EXPORT AppListButton : public views::ImageButton {
} // namespace ash
#endif // ASH_SHELF_APP_LIST_BUTTON_H_
#endif // ASH_COMMON_SHELF_APP_LIST_BUTTON_H_

4
ash/shelf/app_list_shelf_item_delegate.cc → ash/common/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/shelf/app_list_shelf_item_delegate.h"
#include "ash/common/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"

8
ash/shelf/app_list_shelf_item_delegate.h → ash/common/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_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
#define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
#ifndef ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
#define ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
#include "ash/shelf/shelf_item_delegate.h"
#include "ash/common/shelf/shelf_item_delegate.h"
#include "base/macros.h"
namespace ash {
@@ -36,4 +36,4 @@ class AppListShelfItemDelegate : public ShelfItemDelegate {
} // namespace ash
#endif // ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
#endif // ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_

6
ash/shelf/ink_drop_button_listener.h → ash/common/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_SHELF_INK_DROP_BUTTON_LISTENER_H_
#define ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_
#ifndef ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_
#define ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_
#include "ash/ash_export.h"
@@ -38,4 +38,4 @@ class ASH_EXPORT InkDropButtonListener {
} // namespace ash
#endif // ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_
#endif // ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_

10
ash/shelf/overflow_bubble.cc → ash/common/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/shelf/overflow_bubble.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_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"

6
ash/shelf/overflow_bubble.h → ash/common/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_SHELF_OVERFLOW_BUBBLE_H_
#define ASH_SHELF_OVERFLOW_BUBBLE_H_
#ifndef ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_
#define ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_
#include "base/macros.h"
#include "ui/views/pointer_watcher.h"
@@ -62,4 +62,4 @@ class OverflowBubble : public views::PointerWatcher,
} // namespace ash
#endif // ASH_SHELF_OVERFLOW_BUBBLE_H_
#endif // ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_

6
ash/shelf/overflow_bubble_view.cc → ash/common/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/shelf/overflow_bubble_view.h"
#include "ash/common/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"

6
ash/shelf/overflow_bubble_view.h → ash/common/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_SHELF_OVERFLOW_BUBBLE_VIEW_H_
#define ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
#ifndef ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_
#define ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -66,4 +66,4 @@ class ASH_EXPORT OverflowBubbleView : public views::BubbleDialogDelegateView {
} // namespace ash
#endif // ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
#endif // ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_

8
ash/shelf/overflow_button.cc → ash/common/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/shelf/overflow_button.h"
#include "ash/common/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"

6
ash/shelf/overflow_button.h → ash/common/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_SHELF_OVERFLOW_BUTTON_H_
#define ASH_SHELF_OVERFLOW_BUTTON_H_
#ifndef ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
#define ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
#include "base/macros.h"
#include "ui/gfx/geometry/rect.h"
@@ -64,4 +64,4 @@ class OverflowButton : public views::CustomButton {
} // namespace ash
#endif // ASH_SHELF_OVERFLOW_BUTTON_H_
#endif // ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_

6
ash/shelf/shelf_alignment_menu.cc → ash/common/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/shelf/shelf_alignment_menu.h"
#include "ash/common/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 {

6
ash/shelf/shelf_alignment_menu.h → ash/common/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_SHELF_SHELF_ALIGNMENT_MENU_H_
#define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
#ifndef ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
#define ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -40,4 +40,4 @@ class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel,
} // namespace ash
#endif // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
#endif // ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_

4
ash/shelf/shelf_application_menu_model.cc → ash/common/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/shelf/shelf_application_menu_model.h"
#include "ash/common/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 {

6
ash/shelf/shelf_application_menu_model.h → ash/common/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_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
#define ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
#ifndef ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
#define ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
#include <memory>
#include <vector>
@@ -61,4 +61,4 @@ class ASH_EXPORT ShelfApplicationMenuModel
} // namespace ash
#endif // ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
#endif // ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_

4
ash/shelf/shelf_application_menu_model_unittest.cc → ash/common/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/shelf/shelf_application_menu_model.h"
#include "ash/common/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"

8
ash/shelf/shelf_background_animator.cc → ash/common/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/shelf/shelf_background_animator.h"
#include "ash/common/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"

8
ash/shelf/shelf_background_animator.h → ash/common/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_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
#define ASH_COMMON_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 @@ class ASH_EXPORT ShelfBackgroundAnimator : public WmShelfObserver,
} // namespace ash
#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_

6
ash/shelf/shelf_background_animator_observer.h → ash/common/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_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
#define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
#include "ash/ash_export.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -25,4 +25,4 @@ class ASH_EXPORT ShelfBackgroundAnimatorObserver {
} // namespace ash
#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_

6
ash/shelf/shelf_background_animator_unittest.cc → ash/common/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/shelf/shelf_background_animator.h"
#include "ash/common/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"

10
ash/shelf/shelf_button.cc → ash/common/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/shelf/shelf_button.h"
#include "ash/common/shelf/shelf_button.h"
#include <algorithm>
#include "ash/common/ash_constants.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/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 "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "skia/ext/image_operations.h"

6
ash/shelf/shelf_button.h → ash/common/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_SHELF_SHELF_BUTTON_H_
#define ASH_SHELF_SHELF_BUTTON_H_
#ifndef ASH_COMMON_SHELF_SHELF_BUTTON_H_
#define ASH_COMMON_SHELF_SHELF_BUTTON_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -126,4 +126,4 @@ class ASH_EXPORT ShelfButton : public views::CustomButton {
} // namespace ash
#endif // ASH_SHELF_SHELF_BUTTON_H_
#endif // ASH_COMMON_SHELF_SHELF_BUTTON_H_

2
ash/shelf/shelf_button_pressed_metric_tracker.cc → ash/common/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/shelf/shelf_button_pressed_metric_tracker.h"
#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
#include "ash/common/wm_shell.h"
#include "base/metrics/histogram_macros.h"

8
ash/shelf/shelf_button_pressed_metric_tracker.h → ash/common/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_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
#define ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
#ifndef ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
#define ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
#include <memory>
#include "ash/ash_export.h"
#include "ash/shelf/shelf_item_delegate.h"
#include "ash/common/shelf/shelf_item_delegate.h"
#include "base/macros.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
@@ -88,4 +88,4 @@ class ASH_EXPORT ShelfButtonPressedMetricTracker {
} // namespace ash
#endif // ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
#endif // ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_

4
ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc → ash/common/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/shelf/shelf_button_pressed_metric_tracker.h"
#include "ash/common/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"

2
ash/shelf/shelf_constants.cc → ash/common/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/shelf/shelf_constants.h"
#include "ash/common/shelf/shelf_constants.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkColor.h"

6
ash/shelf/shelf_constants.h → ash/common/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_SHELF_SHELF_CONSTANTS_H_
#define ASH_SHELF_SHELF_CONSTANTS_H_
#ifndef ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
#define ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
#include "ash/ash_export.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -79,4 +79,4 @@ ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant);
} // namespace ash
#endif // ASH_SHELF_SHELF_CONSTANTS_H_
#endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_

6
ash/shelf/shelf_controller.cc → ash/common/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/shelf/shelf_controller.h"
#include "ash/common/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"

10
ash/shelf/shelf_controller.h → ash/common/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_SHELF_SHELF_CONTROLLER_H_
#define ASH_SHELF_SHELF_CONTROLLER_H_
#ifndef ASH_COMMON_SHELF_SHELF_CONTROLLER_H_
#define ASH_COMMON_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 @@ class ShelfController : public mojom::ShelfController {
} // namespace ash
#endif // ASH_SHELF_SHELF_CONTROLLER_H_
#endif // ASH_COMMON_SHELF_SHELF_CONTROLLER_H_

8
ash/shelf/shelf_delegate.h → ash/common/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_SHELF_SHELF_DELEGATE_H_
#define ASH_SHELF_SHELF_DELEGATE_H_
#ifndef ASH_COMMON_SHELF_SHELF_DELEGATE_H_
#define ASH_COMMON_SHELF_SHELF_DELEGATE_H_
#include <string>
#include "ash/ash_export.h"
#include "ash/shelf/shelf_item_types.h"
#include "ash/common/shelf/shelf_item_types.h"
namespace ash {
@@ -52,4 +52,4 @@ class ASH_EXPORT ShelfDelegate {
} // namespace ash
#endif // ASH_SHELF_SHELF_DELEGATE_H_
#endif // ASH_COMMON_SHELF_SHELF_DELEGATE_H_

2
ash/shelf/shelf_item_delegate.cc → ash/common/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/shelf/shelf_item_delegate.h"
#include "ash/common/shelf/shelf_item_delegate.h"
#include "ui/display/types/display_constants.h"

6
ash/shelf/shelf_item_delegate.h → ash/common/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_SHELF_SHELF_ITEM_DELEGATE_H_
#define ASH_SHELF_SHELF_ITEM_DELEGATE_H_
#ifndef ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_
#define ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_
#include <stdint.h>
@@ -48,4 +48,4 @@ class ASH_EXPORT ShelfItemDelegate {
} // namespace ash
#endif // ASH_SHELF_SHELF_ITEM_DELEGATE_H_
#endif // ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_

Some files were not shown because too many files have changed in this diff Show More