Revert "chromeos: Move files in //ash/common to //ash, part 3"
Landing this right after the M58 branch will complicate backports. I'm going to land it right before the M59 branch. This reverts commit654b40da8d. 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 3 the rest 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 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://codereview.chromium.org/2729363002 Cr-Original-Commit-Position: refs/heads/master@{#454793} Committed:654b40da8dReview-Url: https://codereview.chromium.org/2734733002 . Cr-Commit-Position: refs/heads/master@{#454797}
This commit is contained in:
James Cook
WATCHLISTS
ash
BUILD.gnDEPSREADME.md
accelerators
accelerator_commands.ccaccelerator_commands_aura.ccaccelerator_controller.ccaccelerator_controller_delegate_aura.ccaccelerator_controller_unittest.ccaccelerator_delegate.ccaccelerator_filter_unittest.ccaccelerator_interactive_uitest_chromeos.ccaccelerator_router.ccash_focus_manager_factory.ccdebug_commands.ccexit_warning_handler.ccmagnifier_key_scroller.ccspoken_feedback_toggler.ccspoken_feedback_toggler_unittest.cc
app_list
app_list_delegate_impl.ccapp_list_presenter_delegate.ccapp_list_presenter_delegate.happ_list_presenter_delegate_unittest.cc
ash_touch_exploration_manager_chromeos.ccaura
aura_layout_manager_adapter.cckey_event_watcher_aura.hpointer_watcher_adapter_unittest.ccwm_shell_aura.ccwm_shell_aura.h
autoclick
common
DEPSaccessibility_delegate.haccessibility_types.hash_constants.ccash_constants.hash_layout_constants.ccash_layout_constants.hash_switches.ccash_switches.hash_view_ids.hcast_config_controller.cccast_config_controller.hdefault_accessibility_delegate.ccdefault_accessibility_delegate.h
devtools
OWNERSash_devtools_css_agent.ccash_devtools_css_agent.hash_devtools_dom_agent.ccash_devtools_dom_agent.hash_devtools_unittest.cc
focus_cycler.ccfocus_cycler.hgpu_support.hgpu_support_stub.ccgpu_support_stub.hime_control_delegate.hkey_event_watcher.cckey_event_watcher.hkeyboard
login_status.hmaterial_design
media_controller.ccmedia_controller.hmojo_interface_factory.ccmojo_interface_factory.hmulti_profile_uma.ccmulti_profile_uma.hmus_property_mirror_ash_unittest.ccnew_window_controller.ccnew_window_controller.hpalette_delegate.hscoped_root_window_for_new_windows.ccscoped_root_window_for_new_windows.hsession
session_controller.ccsession_controller.hsession_controller_unittest.ccsession_state_delegate.ccsession_state_delegate.hsession_state_observer.ccsession_state_observer.h
shell_delegate.hshell_observer.hshutdown_controller.ccshutdown_controller.hwallpaper
DEPSOWNERSwallpaper_controller.ccwallpaper_controller.hwallpaper_controller_observer.hwallpaper_controller_unittest.ccwallpaper_delegate.hwallpaper_view.ccwallpaper_view.hwallpaper_widget_controller.ccwallpaper_widget_controller.h
wm_activation_observer.hwm_display_observer.hwm_layout_manager.hwm_shell.ccwm_shell.hwm_transient_window_observer.hwm_window.ccwm_window.hwm_window_unittest.ccwm_window_user_data.hwm_window_user_data_unittest.cccontent
default_wallpaper_delegate.ccdefault_wallpaper_delegate.hdisplay
cursor_window_controller.ccdisplay_manager_unittest.ccdisplay_util.ccprojecting_observer_chromeos.hroot_window_transformers.ccscreen_ash.ccscreen_orientation_controller_chromeos.ccscreen_orientation_controller_chromeos.hscreen_position_controller.ccshutdown_observer_chromeos.ccshutdown_observer_chromeos.hwindow_tree_host_manager.ccwindow_tree_host_manager_unittest.cc
drag_drop
drag_drop_controller.ccdrag_drop_controller.hdrag_drop_tracker.ccdrag_drop_tracker_unittest.ccdrag_image_view.cc
extended_desktop_unittest.ccfirst_run
focus_cycler_unittest.ccframe
caption_buttons
frame_caption_button_container_view.ccframe_caption_button_container_view_unittest.ccframe_size_button.ccframe_size_button_unittest.cc
custom_frame_view_ash.cccustom_frame_view_ash_unittest.ccdefault_header_painter.ccframe_border_hit_test.ccheader_painter_util.ccheader_view.ccheader_view.hhigh_contrast
magnifier
metrics
desktop_task_switch_metric_recorder.ccdesktop_task_switch_metric_recorder_unittest.ccpointer_metrics_recorder.ccpointer_metrics_recorder_unittest.ccuser_metrics_recorder.ccuser_metrics_recorder_unittest.cc
mus
DEPS
root_window_controller.ccroot_window_controller.hroot_window_controller_unittest.ccscreen_util_unittest.ccaccelerators
accessibility_delegate_mus.hbridge
context_menu_mus.ccdisconnected_app_handler.ccframe
keyboard_ui_mus.cckeyboard_ui_mus.hmove_event_handler.ccnetwork_connect_delegate_mus.ccnon_client_frame_controller.ccscreen_mus.ccshelf_delegate_mus.ccshell_delegate_mus.ccshell_delegate_mus.htest
top_level_window_factory.cctop_level_window_factory_unittest.ccwallpaper_delegate_mus.hwindow_manager.ccwindow_manager_application.ccshelf
app_list_button.ccapp_list_shelf_item_delegate.ccoverflow_bubble.ccoverflow_bubble_view.ccshelf_alignment_menu.ccshelf_background_animator.ccshelf_background_animator.hshelf_background_animator_unittest.ccshelf_button.ccshelf_button_pressed_metric_tracker.ccshelf_button_pressed_metric_tracker_unittest.ccshelf_controller.ccshelf_layout_manager.ccshelf_layout_manager.hshelf_layout_manager_unittest.ccshelf_locking_manager.ccshelf_locking_manager.hshelf_locking_manager_unittest.ccshelf_tooltip_manager.ccshelf_tooltip_manager_unittest.ccshelf_view.ccshelf_view_unittest.ccshelf_widget.ccshelf_widget_unittest.ccshelf_window_targeter.ccshelf_window_watcher.ccshelf_window_watcher_item_delegate.ccshelf_window_watcher_unittest.ccwm_shelf.cc
shell.ccshell
app_list.cc
shell_unittest.cccontent
lock_view.ccshell_delegate_impl.ccshell_delegate_impl.hwindow_type_launcher.ccwindow_watcher.ccsticky_keys
system
accessibility_observer.h
audio
bluetooth
brightness
cast
date
date_default_view.ccdate_default_view.hdate_view.ccsystem_info_default_view.htray_date.cctray_date.htray_system_info.cctray_system_info.h
enterprise
ime
ime_menu
keyboard_brightness_controller.cclocale
media_security
network
network_state_list_detailed_view.ccnetwork_state_list_detailed_view.htray_network.cctray_vpn.ccvpn_list_view.cc
overview
palette
power
dual_role_notification.ccpower_event_observer.ccpower_status.ccpower_status_view.cctablet_power_button_controller.cctablet_power_button_controller.htablet_power_button_controller_unittest.cctray_power.ccvideo_activity_notifier.cc
rotation
screen_layout_observer.ccscreen_layout_observer.hscreen_security
screen_capture_tray_item.ccscreen_capture_tray_item.hscreen_share_tray_item.ccscreen_tray_item.ccscreen_tray_item_unittest.cc
session
logout_button_tray.cclogout_button_tray.hlogout_confirmation_controller.cclogout_confirmation_controller.hlogout_confirmation_dialog.cctray_session_length_limit.cc
settings
status_area_layout_manager.ccstatus_area_widget.ccstatus_area_widget.hstatus_area_widget_delegate.ccsupervised
system_clock_observer.cctiles
toast
tray
actionable_view.cchover_highlight_view.cclabel_tray_view.ccspecial_popup_row.ccspecial_popup_row.hsystem_menu_button.ccsystem_tray.ccsystem_tray_bubble.ccsystem_tray_bubble.hsystem_tray_controller.ccsystem_tray_delegate.hsystem_tray_item.hsystem_tray_notifier.hsystem_tray_unittest.cctray_background_view.cctray_bubble_wrapper.cctray_details_view.cctray_details_view_unittest.cctray_event_filter.cctray_item_view.cctray_popup_header_button.cctray_popup_utils.cctray_popup_utils.htray_utils.cc
tray_accessibility.cctray_accessibility.htray_caps_lock.cctray_tracing.ccupdate
user
button_from_view.cclogin_status.cclogin_status.htray_user.cctray_user_unittest.ccuser_card_view.ccuser_card_view.huser_view.cc
virtual_keyboard
web_notification
test
ash_test.ccash_test.hash_test_base.ccash_test_helper.ccash_test_impl_aura.ccshell_test_api.ccstatus_area_widget_test_helper.cctest_palette_delegate.htest_session_state_delegate.cctest_session_state_delegate.htest_shelf_delegate.cctest_shelf_item_delegate.cctest_shell_delegate.cctest_shell_delegate.htest_system_tray_delegate.cctest_wallpaper_delegate.cctray_cast_test_api.ccui_controls_factory_ash.ccwm_shell_test_api.ccwm_window_test_api.h
tooltips
touch
utility
virtual_keyboard_controller.ccvirtual_keyboard_controller.hvirtual_keyboard_controller_unittest.ccwm
always_on_top_controller.ccalways_on_top_controller_unittest.ccash_focus_rules.ccash_focus_rules_unittest.cccontainer_finder.cccontainer_finder_unittest.ccdefault_state.ccdefault_window_resizer.cc
dock
docked_window_layout_manager.ccdocked_window_layout_manager.hdocked_window_layout_manager_unittest.ccdocked_window_resizer.ccdocked_window_resizer_unittest.cc
drag_details.ccdrag_window_resizer.ccdrag_window_resizer_unittest.ccevent_client_impl.ccfocus_rules.ccfullscreen_window_finder.ccgestures
immersive_context_ash.ccimmersive_fullscreen_controller_unittest.cclock_layout_manager.cclock_layout_manager.hlock_state_controller.cclock_state_controller.hlock_state_controller_unittest.cclock_window_state.ccmaximize_mode
maximize_mode_controller.ccmaximize_mode_controller.hmaximize_mode_controller_unittest.ccmaximize_mode_event_handler.ccmaximize_mode_window_manager.ccmaximize_mode_window_manager.hmaximize_mode_window_manager_unittest.ccmaximize_mode_window_state.ccworkspace_backdrop_delegate.cc
mru_window_tracker.ccmru_window_tracker.hmru_window_tracker_unittest.ccoverlay_event_filter.hoverview
cleanup_animation_observer_unittest.ccscoped_overview_animation_settings_factory_aura.ccscoped_transform_overview_window.ccwindow_grid.ccwindow_selector.ccwindow_selector.hwindow_selector_controller.ccwindow_selector_item.ccwindow_selector_unittest.cc
panels
attached_panel_window_targeter.ccattached_panel_window_targeter.hpanel_frame_view.ccpanel_frame_view.hpanel_layout_manager.ccpanel_layout_manager.hpanel_layout_manager_unittest.ccpanel_window_event_handler.ccpanel_window_resizer.ccpanel_window_resizer_unittest.cc
power_button_controller.ccresize_handle_window_targeter.ccresize_shadow_and_cursor_unittest.ccroot_window_finder.ccroot_window_layout_manager.ccroot_window_layout_manager.hscreen_dimmer.ccscreen_dimmer.hscreen_dimmer_unittest.ccscreen_pinning_controller.ccscreen_pinning_controller_unittest.ccsession_state_animator.ccstacking_controller.ccswitchable_windows.ccsystem_gesture_event_filter_unittest.ccsystem_modal_container_event_filter.ccsystem_modal_container_layout_manager.ccsystem_modal_container_layout_manager_unittest.cctoplevel_window_event_handler.cctoplevel_window_event_handler_unittest.ccvideo_detector.ccvideo_detector.hwindow_animations.ccwindow_cycle_controller.ccwindow_cycle_controller_unittest.ccwindow_cycle_event_filter_aura.ccwindow_cycle_list.ccwindow_dimmer.ccwindow_mirror_view.ccwindow_parenting_utils.ccwindow_positioner.ccwindow_positioner_unittest.ccwindow_positioning_utils.ccwindow_resizer.ccwindow_state.ccwindow_state_aura.ccwindow_state_util.ccwindow_util.ccwindow_util_unittest.ccwm_screen_util.ccwm_snap_to_pixel_layout_manager.ccwm_snap_to_pixel_layout_manager.hwm_toplevel_window_event_handler.ccwm_toplevel_window_event_handler.hworkspace
multi_window_resize_controller.ccmulti_window_resize_controller_unittest.ccphantom_window_controller.ccworkspace_event_handler.ccworkspace_event_handler_aura.ccworkspace_layout_manager.ccworkspace_layout_manager.hworkspace_layout_manager_keyboard_unittest.ccworkspace_layout_manager_unittest.ccworkspace_window_resizer.ccworkspace_window_resizer_unittest.cc
workspace_controller.ccworkspace_controller_unittest.ccchrome
browser
DEPSabout_flags.ccbookmark_app_helper.ccdisplay_info_provider_chromeos_unittest.ccglobal_shortcut_listener_chromeos.cc
chromeos
accessibility
accessibility_manager.ccaccessibility_manager.haccessibility_manager_browsertest.ccchromevox_panel.ccmagnification_manager.ccmagnification_manager.hmagnification_manager_browsertest.ccmagnification_manager_unittest.ccspoken_feedback_browsertest.ccsticky_keys_browsertest.cctouch_exploration_controller_browsertest.cc
arc
background
customization
display
extensions
first_run
steps
login
chrome_restart_request.cckiosk_browsertest.cc
lock
login_browsertest.ccsupervised
ui
users
chrome_user_manager_impl.cc
wizard_controller_browsertest.ccwallpaper
net
note_taking_helper_unittest.ccpolicy
configuration_policy_handler_chromeos.ccdevice_local_account_browsertest.ccdevice_system_use_24hour_clock_browsertest.ccdisplay_rotation_default_handler.ccdisplay_rotation_default_handler.hlogin_screen_default_policy_browsertest.ccrecommendation_restorer_unittest.cc
power
preferences.ccpreferences.hprofiles
shutdown_policy_browsertest.ccsystem
ui
extensions
api
automation
memory
notifications
policy
prefs
resources
ui
ash
DEPSaccelerator_commands_browsertest.ccaccelerator_controller_browsertest.cc
app_list
ash_init.ccash_util.ccchrome_new_window_client_browsertest.ccchrome_shell_delegate.ccchrome_shell_delegate.hime_controller_chromeos.hlauncher
arc_app_launcher_browsertest.ccarc_app_window_launcher_controller.ccarc_app_window_launcher_controller.hbrowser_shortcut_launcher_item_controller.ccchrome_launcher_controller_impl.ccchrome_launcher_controller_impl_browsertest.ccchrome_launcher_controller_impl_unittest.ccextension_app_window_launcher_controller.ccextension_launcher_context_menu.cclauncher_context_menu.cclauncher_context_menu_unittest.ccmulti_profile_browser_status_monitor.cc
multi_user
multi_user_context_menu_chromeos.ccmulti_user_notification_blocker_chromeos_unittest.ccmulti_user_window_manager.ccmulti_user_window_manager_chromeos.ccmulti_user_window_manager_chromeos_unittest.ccuser_switch_animator_chromeos.ccuser_switch_util.ccuser_switch_util_unittest.cc
networking_config_delegate_chromeos_browsertest.ccpalette_delegate_chromeos.hsession_state_delegate_chromeos.ccsession_state_delegate_chromeos.hsession_util.ccshelf_browsertest.ccsystem_tray_client.ccsystem_tray_client_browsertest.ccsystem_tray_delegate_chromeos.ccsystem_tray_delegate_chromeos.hsystem_tray_tray_cast_browsertest_media_router_chromeos.ccvolume_controller_browsertest.ccwindow_positioner_unittest.ccviews
apps
chrome_views_delegate_chromeos.ccframe
browser_frame_ash.ccbrowser_header_painter_ash.ccbrowser_non_client_frame_view_ash.ccbrowser_non_client_frame_view_ash.hbrowser_non_client_frame_view_ash_browsertest.ccbrowser_view_interactive_uitest.ccimmersive_mode_controller_ash.cc
tabs
webui
chromeos
options
settings
window_sizer
common
components
arc
intent_helper
exo
remoting/host
ui/arc/notification
@ -1120,7 +1120,7 @@
|
||||
'filepath': 'ui/keyboard/'\
|
||||
'|chrome/test/data/chromeos/virtual_keyboard/'\
|
||||
'|extensions/browser/api/virtual_keyboard_private/'\
|
||||
'|ash/system/virtual_keyboard/'\
|
||||
'|ash/common/system/chromeos/virtual_keyboard/'\
|
||||
'|ash/virtual_keyboard',
|
||||
},
|
||||
'virtual_reality': {
|
||||
|
||||
144
ash/BUILD.gn
144
ash/BUILD.gn
@ -42,8 +42,6 @@ component("ash") {
|
||||
"accelerators/magnifier_key_scroller.h",
|
||||
"accelerators/spoken_feedback_toggler.cc",
|
||||
"accelerators/spoken_feedback_toggler.h",
|
||||
"accessibility_delegate.h",
|
||||
"accessibility_types.h",
|
||||
"animation/animation_change_type.h",
|
||||
"app_list/app_list_delegate_impl.cc",
|
||||
"app_list/app_list_delegate_impl.h",
|
||||
@ -51,13 +49,7 @@ component("ash") {
|
||||
"app_list/app_list_presenter_delegate.h",
|
||||
"app_list/app_list_presenter_delegate_factory.cc",
|
||||
"app_list/app_list_presenter_delegate_factory.h",
|
||||
"ash_constants.cc",
|
||||
"ash_constants.h",
|
||||
"ash_export.h",
|
||||
"ash_layout_constants.cc",
|
||||
"ash_layout_constants.h",
|
||||
"ash_switches.cc",
|
||||
"ash_switches.h",
|
||||
"ash_touch_exploration_manager_chromeos.cc",
|
||||
"ash_touch_exploration_manager_chromeos.h",
|
||||
"aura/aura_layout_manager_adapter.cc",
|
||||
@ -72,18 +64,76 @@ component("ash") {
|
||||
"autoclick/autoclick_controller.h",
|
||||
"cancel_mode.cc",
|
||||
"cancel_mode.h",
|
||||
"cast_config_controller.cc",
|
||||
"cast_config_controller.h",
|
||||
"common/accessibility_delegate.h",
|
||||
"common/accessibility_types.h",
|
||||
"common/ash_constants.cc",
|
||||
"common/ash_constants.h",
|
||||
"common/ash_layout_constants.cc",
|
||||
"common/ash_layout_constants.h",
|
||||
"common/ash_switches.cc",
|
||||
"common/ash_switches.h",
|
||||
"common/cast_config_controller.cc",
|
||||
"common/cast_config_controller.h",
|
||||
"common/default_accessibility_delegate.cc",
|
||||
"common/default_accessibility_delegate.h",
|
||||
"common/devtools/ash_devtools_css_agent.cc",
|
||||
"common/devtools/ash_devtools_css_agent.h",
|
||||
"common/devtools/ash_devtools_dom_agent.cc",
|
||||
"common/devtools/ash_devtools_dom_agent.h",
|
||||
"common/focus_cycler.cc",
|
||||
"common/focus_cycler.h",
|
||||
"common/gpu_support.h",
|
||||
"common/gpu_support_stub.cc",
|
||||
"common/gpu_support_stub.h",
|
||||
"common/key_event_watcher.cc",
|
||||
"common/key_event_watcher.h",
|
||||
"common/keyboard/keyboard_ui.cc",
|
||||
"common/keyboard/keyboard_ui.h",
|
||||
"common/keyboard/keyboard_ui_observer.h",
|
||||
"common/login_status.h",
|
||||
"common/material_design/material_design_controller.cc",
|
||||
"common/material_design/material_design_controller.h",
|
||||
"common/media_controller.cc",
|
||||
"common/media_controller.h",
|
||||
"common/mojo_interface_factory.cc",
|
||||
"common/mojo_interface_factory.h",
|
||||
"common/multi_profile_uma.cc",
|
||||
"common/multi_profile_uma.h",
|
||||
"common/new_window_controller.cc",
|
||||
"common/new_window_controller.h",
|
||||
"common/palette_delegate.h",
|
||||
"common/scoped_root_window_for_new_windows.cc",
|
||||
"common/scoped_root_window_for_new_windows.h",
|
||||
"common/session/session_controller.cc",
|
||||
"common/session/session_controller.h",
|
||||
"common/session/session_state_delegate.cc",
|
||||
"common/session/session_state_delegate.h",
|
||||
"common/session/session_state_observer.cc",
|
||||
"common/session/session_state_observer.h",
|
||||
"common/shell_delegate.h",
|
||||
"common/shutdown_controller.cc",
|
||||
"common/shutdown_controller.h",
|
||||
"common/wallpaper/wallpaper_controller.cc",
|
||||
"common/wallpaper/wallpaper_controller.h",
|
||||
"common/wallpaper/wallpaper_controller_observer.h",
|
||||
"common/wallpaper/wallpaper_delegate.h",
|
||||
"common/wallpaper/wallpaper_view.cc",
|
||||
"common/wallpaper/wallpaper_view.h",
|
||||
"common/wallpaper/wallpaper_widget_controller.cc",
|
||||
"common/wallpaper/wallpaper_widget_controller.h",
|
||||
"common/wm_activation_observer.h",
|
||||
"common/wm_display_observer.h",
|
||||
"common/wm_layout_manager.h",
|
||||
"common/wm_shell.cc",
|
||||
"common/wm_shell.h",
|
||||
"common/wm_transient_window_observer.h",
|
||||
"common/wm_window.cc",
|
||||
"common/wm_window.h",
|
||||
"common/wm_window_user_data.h",
|
||||
"debug.cc",
|
||||
"debug.h",
|
||||
"default_accessibility_delegate.cc",
|
||||
"default_accessibility_delegate.h",
|
||||
"default_wallpaper_delegate.cc",
|
||||
"default_wallpaper_delegate.h",
|
||||
"devtools/ash_devtools_css_agent.cc",
|
||||
"devtools/ash_devtools_css_agent.h",
|
||||
"devtools/ash_devtools_dom_agent.cc",
|
||||
"devtools/ash_devtools_dom_agent.h",
|
||||
"display/cursor_window_controller.cc",
|
||||
"display/cursor_window_controller.h",
|
||||
"display/display_animator.h",
|
||||
@ -143,8 +193,6 @@ component("ash") {
|
||||
"first_run/first_run_helper.h",
|
||||
"first_run/first_run_helper_impl.cc",
|
||||
"first_run/first_run_helper_impl.h",
|
||||
"focus_cycler.cc",
|
||||
"focus_cycler.h",
|
||||
"frame/caption_buttons/caption_button_types.h",
|
||||
"frame/caption_buttons/frame_caption_button.cc",
|
||||
"frame/caption_buttons/frame_caption_button.h",
|
||||
@ -164,9 +212,6 @@ component("ash") {
|
||||
"frame/header_painter_util.h",
|
||||
"frame/header_view.cc",
|
||||
"frame/header_view.h",
|
||||
"gpu_support.h",
|
||||
"gpu_support_stub.cc",
|
||||
"gpu_support_stub.h",
|
||||
"high_contrast/high_contrast_controller.cc",
|
||||
"high_contrast/high_contrast_controller.h",
|
||||
"host/ash_window_tree_host.cc",
|
||||
@ -183,11 +228,6 @@ component("ash") {
|
||||
"host/transformer_helper.h",
|
||||
"ime/input_method_event_handler.cc",
|
||||
"ime/input_method_event_handler.h",
|
||||
"key_event_watcher.cc",
|
||||
"key_event_watcher.h",
|
||||
"keyboard/keyboard_ui.cc",
|
||||
"keyboard/keyboard_ui.h",
|
||||
"keyboard/keyboard_ui_observer.h",
|
||||
"laser/laser_pointer_controller.cc",
|
||||
"laser/laser_pointer_controller.h",
|
||||
"laser/laser_pointer_points.cc",
|
||||
@ -200,15 +240,10 @@ component("ash") {
|
||||
"link_handler_model.h",
|
||||
"link_handler_model_factory.cc",
|
||||
"link_handler_model_factory.h",
|
||||
"login_status.h",
|
||||
"magnifier/magnification_controller.cc",
|
||||
"magnifier/magnification_controller.h",
|
||||
"magnifier/partial_magnification_controller.cc",
|
||||
"magnifier/partial_magnification_controller.h",
|
||||
"material_design/material_design_controller.cc",
|
||||
"material_design/material_design_controller.h",
|
||||
"media_controller.cc",
|
||||
"media_controller.h",
|
||||
"metrics/desktop_task_switch_metric_recorder.cc",
|
||||
"metrics/desktop_task_switch_metric_recorder.h",
|
||||
"metrics/gesture_action_type.h",
|
||||
@ -221,13 +256,6 @@ component("ash") {
|
||||
"metrics/user_metrics_action.h",
|
||||
"metrics/user_metrics_recorder.cc",
|
||||
"metrics/user_metrics_recorder.h",
|
||||
"mojo_interface_factory.cc",
|
||||
"mojo_interface_factory.h",
|
||||
"multi_profile_uma.cc",
|
||||
"multi_profile_uma.h",
|
||||
"new_window_controller.cc",
|
||||
"new_window_controller.h",
|
||||
"palette_delegate.h",
|
||||
"root_window_controller.cc",
|
||||
"root_window_controller.h",
|
||||
"root_window_settings.cc",
|
||||
@ -238,17 +266,9 @@ component("ash") {
|
||||
"rotator/screen_rotation_animator.h",
|
||||
"rotator/window_rotation.cc",
|
||||
"rotator/window_rotation.h",
|
||||
"scoped_root_window_for_new_windows.cc",
|
||||
"scoped_root_window_for_new_windows.h",
|
||||
"screen_util.cc",
|
||||
"screen_util.h",
|
||||
"screenshot_delegate.h",
|
||||
"session/session_controller.cc",
|
||||
"session/session_controller.h",
|
||||
"session/session_state_delegate.cc",
|
||||
"session/session_state_delegate.h",
|
||||
"session/session_state_observer.cc",
|
||||
"session/session_state_observer.h",
|
||||
"shared/immersive_context.cc",
|
||||
"shared/immersive_context.h",
|
||||
"shared/immersive_focus_watcher.h",
|
||||
@ -320,10 +340,7 @@ component("ash") {
|
||||
"shelf/wm_shelf_util.h",
|
||||
"shell.cc",
|
||||
"shell.h",
|
||||
"shell_delegate.h",
|
||||
"shell_init_params.h",
|
||||
"shutdown_controller.cc",
|
||||
"shutdown_controller.h",
|
||||
"sticky_keys/sticky_keys_controller.cc",
|
||||
"sticky_keys/sticky_keys_controller.h",
|
||||
"sticky_keys/sticky_keys_overlay.cc",
|
||||
@ -608,14 +625,6 @@ component("ash") {
|
||||
"utility/screenshot_controller.h",
|
||||
"virtual_keyboard_controller.cc",
|
||||
"virtual_keyboard_controller.h",
|
||||
"wallpaper/wallpaper_controller.cc",
|
||||
"wallpaper/wallpaper_controller.h",
|
||||
"wallpaper/wallpaper_controller_observer.h",
|
||||
"wallpaper/wallpaper_delegate.h",
|
||||
"wallpaper/wallpaper_view.cc",
|
||||
"wallpaper/wallpaper_view.h",
|
||||
"wallpaper/wallpaper_widget_controller.cc",
|
||||
"wallpaper/wallpaper_widget_controller.h",
|
||||
"wm/always_on_top_controller.cc",
|
||||
"wm/always_on_top_controller.h",
|
||||
"wm/ash_focus_rules.cc",
|
||||
@ -821,15 +830,6 @@ component("ash") {
|
||||
"wm/workspace/workspace_window_resizer.h",
|
||||
"wm/workspace_controller.cc",
|
||||
"wm/workspace_controller.h",
|
||||
"wm_activation_observer.h",
|
||||
"wm_display_observer.h",
|
||||
"wm_layout_manager.h",
|
||||
"wm_shell.cc",
|
||||
"wm_shell.h",
|
||||
"wm_transient_window_observer.h",
|
||||
"wm_window.cc",
|
||||
"wm_window.h",
|
||||
"wm_window_user_data.h",
|
||||
]
|
||||
|
||||
configs += [ "//build/config:precompiled_headers" ]
|
||||
@ -1157,7 +1157,12 @@ source_set("common_unittests") {
|
||||
"accelerators/spoken_feedback_toggler_unittest.cc",
|
||||
"ash_touch_exploration_manager_chromeos_unittest.cc",
|
||||
"autoclick/autoclick_unittest.cc",
|
||||
"devtools/ash_devtools_unittest.cc",
|
||||
"common/devtools/ash_devtools_unittest.cc",
|
||||
"common/mus_property_mirror_ash_unittest.cc",
|
||||
"common/session/session_controller_unittest.cc",
|
||||
"common/wallpaper/wallpaper_controller_unittest.cc",
|
||||
"common/wm_window_unittest.cc",
|
||||
"common/wm_window_user_data_unittest.cc",
|
||||
"drag_drop/drag_image_view_unittest.cc",
|
||||
"first_run/first_run_helper_unittest.cc",
|
||||
"focus_cycler_unittest.cc",
|
||||
@ -1173,11 +1178,9 @@ source_set("common_unittests") {
|
||||
"metrics/task_switch_metrics_recorder_unittest.cc",
|
||||
"metrics/task_switch_time_tracker_unittest.cc",
|
||||
"metrics/user_metrics_recorder_unittest.cc",
|
||||
"mus_property_mirror_ash_unittest.cc",
|
||||
"root_window_controller_unittest.cc",
|
||||
"rotator/screen_rotation_animation_unittest.cc",
|
||||
"screen_util_unittest.cc",
|
||||
"session/session_controller_unittest.cc",
|
||||
"shelf/shelf_application_menu_model_unittest.cc",
|
||||
"shelf/shelf_background_animator_unittest.cc",
|
||||
"shelf/shelf_button_pressed_metric_tracker_unittest.cc",
|
||||
@ -1229,7 +1232,6 @@ source_set("common_unittests") {
|
||||
"system/web_notification/web_notification_tray_unittest.cc",
|
||||
"test/ash_test_helper_unittest.cc",
|
||||
"tooltips/tooltip_controller_unittest.cc",
|
||||
"wallpaper/wallpaper_controller_unittest.cc",
|
||||
"wm/ash_focus_rules_unittest.cc",
|
||||
"wm/container_finder_unittest.cc",
|
||||
"wm/dock/docked_window_layout_manager_unittest.cc",
|
||||
@ -1241,8 +1243,6 @@ source_set("common_unittests") {
|
||||
"wm/mru_window_tracker_unittest.cc",
|
||||
"wm/overview/cleanup_animation_observer_unittest.cc",
|
||||
"wm/workspace/workspace_layout_manager_unittest.cc",
|
||||
"wm_window_unittest.cc",
|
||||
"wm_window_user_data_unittest.cc",
|
||||
]
|
||||
deps = [
|
||||
"//ash",
|
||||
|
||||
3
ash/DEPS
3
ash/DEPS
@ -1,17 +1,14 @@
|
||||
include_rules = [
|
||||
"+device/bluetooth",
|
||||
"+cc/debug",
|
||||
"+components/prefs",
|
||||
"+components/quirks",
|
||||
"+components/session_manager",
|
||||
"+components/signin/core/account_id",
|
||||
"+components/ui_devtools",
|
||||
"+components/user_manager",
|
||||
"+components/wallpaper",
|
||||
"+gpu/config",
|
||||
"+media",
|
||||
"+mojo/public",
|
||||
"+services/preferences/public",
|
||||
"+services/service_manager/public",
|
||||
"+services/ui/public",
|
||||
"+skia/ext",
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Ash
|
||||
Mus+ash
|
||||
----------
|
||||
Ash is the "aura shell", the window manager and system UI for Chrome
|
||||
OS.
|
||||
|
||||
The mustash project is migrating ash to work with both traditional
|
||||
aura ("classic ash") and the mojo UI service ("mus"). Support for
|
||||
the differences are in ash/aura and ash/mus.
|
||||
Ash is transitioning from using aura to using mus. During the
|
||||
transition period ash has support for both aura and mus. In order to
|
||||
work with both toolkits ash has a porting layer. This layer exists in
|
||||
ash/common. As portions of ash are converted to the porting layer they
|
||||
should move to ash/common. DEPS files may also be used to ensure new
|
||||
dependencies do not get added.
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
#include "ash/accelerators/accelerator_commands.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 "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/metrics/user_metrics.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
|
||||
#include "ash/accelerators/accelerator_commands_aura.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 "ash/wm_window.h"
|
||||
#include "base/metrics/user_metrics.h"
|
||||
#include "ui/display/manager/display_manager.h"
|
||||
#include "ui/display/manager/managed_display_info.h"
|
||||
|
||||
@ -9,20 +9,22 @@
|
||||
#include "ash/accelerators/accelerator_commands.h"
|
||||
#include "ash/accelerators/accelerator_controller_delegate.h"
|
||||
#include "ash/accelerators/debug_commands.h"
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/accessibility_types.h"
|
||||
#include "ash/focus_cycler.h"
|
||||
#include "ash/ime_control_delegate.h"
|
||||
#include "ash/media_controller.h"
|
||||
#include "ash/multi_profile_uma.h"
|
||||
#include "ash/new_window_controller.h"
|
||||
#include "ash/palette_delegate.h"
|
||||
#include "ash/common/accessibility_delegate.h"
|
||||
#include "ash/common/accessibility_types.h"
|
||||
#include "ash/common/focus_cycler.h"
|
||||
#include "ash/common/ime_control_delegate.h"
|
||||
#include "ash/common/media_controller.h"
|
||||
#include "ash/common/multi_profile_uma.h"
|
||||
#include "ash/common/new_window_controller.h"
|
||||
#include "ash/common/palette_delegate.h"
|
||||
#include "ash/common/session/session_state_delegate.h"
|
||||
#include "ash/common/shell_delegate.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/session/session_state_delegate.h"
|
||||
#include "ash/shelf/shelf_widget.h"
|
||||
#include "ash/shelf/wm_shelf.h"
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/strings/grit/ash_strings.h"
|
||||
#include "ash/system/brightness_control_delegate.h"
|
||||
#include "ash/system/ime_menu/ime_menu_tray.h"
|
||||
@ -40,8 +42,6 @@
|
||||
#include "ash/wm/window_positioning_utils.h"
|
||||
#include "ash/wm/window_state.h"
|
||||
#include "ash/wm/wm_event.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/metrics/user_metrics.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
|
||||
@ -11,7 +11,10 @@
|
||||
|
||||
#include "ash/accelerators/accelerator_commands_aura.h"
|
||||
#include "ash/accelerators/debug_commands.h"
|
||||
#include "ash/accessibility_types.h"
|
||||
#include "ash/common/accessibility_types.h"
|
||||
#include "ash/common/session/session_state_delegate.h"
|
||||
#include "ash/common/shell_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/debug.h"
|
||||
#include "ash/display/display_configuration_controller.h"
|
||||
#include "ash/display/window_tree_host_manager.h"
|
||||
@ -21,10 +24,8 @@
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/rotator/window_rotation.h"
|
||||
#include "ash/screenshot_delegate.h"
|
||||
#include "ash/session/session_state_delegate.h"
|
||||
#include "ash/shelf/wm_shelf.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/system/system_notifier.h"
|
||||
#include "ash/system/tray/system_tray.h"
|
||||
#include "ash/touch/touch_hud_debug.h"
|
||||
@ -35,7 +36,6 @@
|
||||
#include "ash/wm/window_state_aura.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm/wm_event.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/metrics/user_metrics.h"
|
||||
|
||||
@ -5,12 +5,14 @@
|
||||
#include "ash/accelerators/accelerator_controller.h"
|
||||
|
||||
#include "ash/accelerators/accelerator_table.h"
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/accessibility_types.h"
|
||||
#include "ash/ash_switches.h"
|
||||
#include "ash/ime_control_delegate.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/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/session/session_state_delegate.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/system/brightness_control_delegate.h"
|
||||
#include "ash/system/keyboard_brightness_control_delegate.h"
|
||||
@ -27,8 +29,6 @@
|
||||
#include "ash/wm/window_state_aura.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm/wm_event.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/test/user_action_tester.cc"
|
||||
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include "ash/accelerators/accelerator_delegate.h"
|
||||
|
||||
#include "ash/accelerators/accelerator_router.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/events/event.h"
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
#include "ash/accelerators/accelerator_controller.h"
|
||||
#include "ash/accelerators/accelerator_delegate.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"
|
||||
@ -17,7 +18,6 @@
|
||||
#include "ash/wm/window_state.h"
|
||||
#include "ash/wm/window_state_aura.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "ui/aura/client/aura_constants.h"
|
||||
#include "ui/aura/test/aura_test_base.h"
|
||||
|
||||
@ -4,8 +4,9 @@
|
||||
|
||||
#include "ash/accelerators/accelerator_controller.h"
|
||||
|
||||
#include "ash/common/shell_observer.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/shell_observer.h"
|
||||
#include "ash/system/network/network_observer.h"
|
||||
#include "ash/system/tray/system_tray_delegate.h"
|
||||
#include "ash/system/tray/system_tray_notifier.h"
|
||||
@ -14,7 +15,6 @@
|
||||
#include "ash/wm/window_state.h"
|
||||
#include "ash/wm/window_state_aura.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "base/test/user_action_tester.cc"
|
||||
#include "chromeos/network/network_handler.h"
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
#include "ash/accelerators/accelerator_router.h"
|
||||
|
||||
#include "ash/accelerators/accelerator_controller.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/wm/window_state.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/stl_util.h"
|
||||
#include "ui/base/accelerators/accelerator.h"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include "ash/accelerators/ash_focus_manager_factory.h"
|
||||
|
||||
#include "ash/accelerators/accelerator_controller.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "ui/views/focus/focus_manager.h"
|
||||
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
#include "ash/accelerators/debug_commands.h"
|
||||
|
||||
#include "ash/accelerators/accelerator_commands.h"
|
||||
#include "ash/ash_switches.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_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/system/toast/toast_data.h"
|
||||
#include "ash/system/toast/toast_manager.h"
|
||||
#include "ash/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
||||
#include "ash/wm/window_properties.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/metrics/user_metrics.h"
|
||||
#include "base/metrics/user_metrics_action.h"
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
#include "ash/accelerators/exit_warning_handler.h"
|
||||
|
||||
#include "ash/common/shell_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/strings/grit/ash_strings.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/time/time.h"
|
||||
#include "base/timer/timer.h"
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include <utility>
|
||||
|
||||
#include "ash/accelerators/key_hold_detector.h"
|
||||
#include "ash/ash_switches.h"
|
||||
#include "ash/common/ash_switches.h"
|
||||
#include "ash/magnifier/magnification_controller.h"
|
||||
#include "ash/shell.h"
|
||||
#include "base/command_line.h"
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
#include <utility>
|
||||
|
||||
#include "ash/accelerators/key_hold_detector.h"
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/accessibility_types.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/common/accessibility_delegate.h"
|
||||
#include "ash/common/accessibility_types.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ui/events/event.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/accelerators/spoken_feedback_toggler.h"
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/common/accessibility_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/test/ash_test_base.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ui/aura/test/test_window_delegate.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/events/test/event_generator.h"
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
#include "ash/app_list/app_list_delegate_impl.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 "ash/wm_shell.h"
|
||||
#include "ui/app_list/presenter/app_list.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -4,7 +4,9 @@
|
||||
|
||||
#include "ash/app_list/app_list_presenter_delegate.h"
|
||||
|
||||
#include "ash/ash_switches.h"
|
||||
#include "ash/common/ash_switches.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/display/window_tree_host_manager.h"
|
||||
#include "ash/public/cpp/shelf_types.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
@ -17,8 +19,6 @@
|
||||
#include "ash/shell.h"
|
||||
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
||||
#include "ash/wm/wm_screen_util.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/command_line.h"
|
||||
#include "ui/app_list/app_list_constants.h"
|
||||
#include "ui/app_list/app_list_switches.h"
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/common/shell_observer.h"
|
||||
#include "ash/shelf/wm_shelf_observer.h"
|
||||
#include "ash/shell_observer.h"
|
||||
#include "base/macros.h"
|
||||
#include "ui/app_list/presenter/app_list_presenter_delegate.h"
|
||||
#include "ui/events/event_handler.h"
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/test/ash_test_base.h"
|
||||
#include "ash/test/test_app_list_view_presenter_impl.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/macros.h"
|
||||
#include "ui/app_list/views/app_list_view.h"
|
||||
#include "ui/aura/test/test_windows.h"
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
#include "ash/ash_touch_exploration_manager_chromeos.h"
|
||||
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/common/accessibility_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/system/tray/system_tray_notifier.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "chromeos/audio/chromeos_sounds.h"
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
#include "ash/aura/aura_layout_manager_adapter.h"
|
||||
|
||||
#include "ash/wm_layout_manager.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "ash/common/wm_layout_manager.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/base/class_property.h"
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include <map>
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/key_event_watcher.h"
|
||||
#include "ash/common/key_event_watcher.h"
|
||||
#include "ui/events/event_handler.h"
|
||||
|
||||
namespace ui {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/test/ash_test_base.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ui/events/base_event_utils.h"
|
||||
#include "ui/events/event.h"
|
||||
#include "ui/events/test/event_generator.h"
|
||||
|
||||
@ -8,16 +8,19 @@
|
||||
|
||||
#include "ash/aura/key_event_watcher_aura.h"
|
||||
#include "ash/aura/pointer_watcher_adapter.h"
|
||||
#include "ash/common/session/session_state_delegate.h"
|
||||
#include "ash/common/shell_delegate.h"
|
||||
#include "ash/common/shell_observer.h"
|
||||
#include "ash/common/wm_activation_observer.h"
|
||||
#include "ash/common/wm_display_observer.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/display/window_tree_host_manager.h"
|
||||
#include "ash/host/ash_window_tree_host_init_params.h"
|
||||
#include "ash/laser/laser_pointer_controller.h"
|
||||
#include "ash/magnifier/partial_magnification_controller.h"
|
||||
#include "ash/metrics/task_switch_metrics_recorder.h"
|
||||
#include "ash/session/session_state_delegate.h"
|
||||
#include "ash/shared/immersive_fullscreen_controller.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/shell_observer.h"
|
||||
#include "ash/touch/touch_uma.h"
|
||||
#include "ash/virtual_keyboard_controller.h"
|
||||
#include "ash/wm/drag_window_resizer.h"
|
||||
@ -29,9 +32,6 @@
|
||||
#include "ash/wm/window_cycle_event_filter_aura.h"
|
||||
#include "ash/wm/window_util.h"
|
||||
#include "ash/wm/workspace/workspace_event_handler_aura.h"
|
||||
#include "ash/wm_activation_observer.h"
|
||||
#include "ash/wm_display_observer.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "ui/aura/client/capture_client.h"
|
||||
#include "ui/aura/client/focus_client.h"
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
#include <memory>
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/display/window_tree_host_manager.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/observer_list.h"
|
||||
|
||||
|
||||
@ -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_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/wm/root_window_finder.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/timer/timer.h"
|
||||
#include "ui/aura/window_observer.h"
|
||||
#include "ui/aura/window_tree_host.h"
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/autoclick/autoclick_controller.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/shell.h"
|
||||
#include "ash/test/ash_test_base.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ui/aura/test/test_window_delegate.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/aura/window_event_dispatcher.h"
|
||||
|
||||
13
ash/common/DEPS
Normal file
13
ash/common/DEPS
Normal file
@ -0,0 +1,13 @@
|
||||
include_rules = [
|
||||
"+components/prefs",
|
||||
"+components/ui_devtools",
|
||||
"+mojo/public/cpp",
|
||||
"+services/preferences/public",
|
||||
"+ui",
|
||||
]
|
||||
|
||||
specific_include_rules = {
|
||||
".*test\.cc": [
|
||||
"+ash/test",
|
||||
]
|
||||
}
|
||||
@ -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_ACCESSIBILITY_DELEGATE_H_
|
||||
#define ASH_ACCESSIBILITY_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_ACCESSIBILITY_DELEGATE_H_
|
||||
#define ASH_COMMON_ACCESSIBILITY_DELEGATE_H_
|
||||
|
||||
#include "ash/accessibility_types.h"
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/common/accessibility_types.h"
|
||||
#include "base/time/time.h"
|
||||
#include "ui/accessibility/ax_enums.h"
|
||||
|
||||
@ -143,4 +143,4 @@ class ASH_EXPORT AccessibilityDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_ACCESSIBILITY_DELEGATE_H_
|
||||
#endif // ASH_COMMON_ACCESSIBILITY_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_ACCESSIBILITY_TYPES_H_
|
||||
#define ASH_ACCESSIBILITY_TYPES_H_
|
||||
#ifndef ASH_COMMON_ACCESSIBILITY_TYPES_H_
|
||||
#define ASH_COMMON_ACCESSIBILITY_TYPES_H_
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -39,4 +39,4 @@ const float kMagnificationScaleFactor = 1.18920712f;
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_ACCESSIBILITY_TYPES_H_
|
||||
#endif // ASH_COMMON_ACCESSIBILITY_TYPES_H_
|
||||
@ -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/ash_constants.h"
|
||||
#include "ash/common/ash_constants.h"
|
||||
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "ui/gfx/color_palette.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_ASH_CONSTANTS_H_
|
||||
#define ASH_ASH_CONSTANTS_H_
|
||||
#ifndef ASH_COMMON_ASH_CONSTANTS_H_
|
||||
#define ASH_COMMON_ASH_CONSTANTS_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
|
||||
@ -34,4 +34,4 @@ ASH_EXPORT extern const int kDefaultLargeCursorSize;
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_ASH_CONSTANTS_H_
|
||||
#endif // ASH_COMMON_ASH_CONSTANTS_H_
|
||||
@ -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/ash_layout_constants.h"
|
||||
#include "ash/common/ash_layout_constants.h"
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "ui/base/material_design/material_design_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_ASH_LAYOUT_CONSTANTS_H_
|
||||
#define ASH_ASH_LAYOUT_CONSTANTS_H_
|
||||
#ifndef ASH_COMMON_ASH_LAYOUT_CONSTANTS_H_
|
||||
#define ASH_COMMON_ASH_LAYOUT_CONSTANTS_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ui/gfx/geometry/size.h"
|
||||
@ -21,4 +21,4 @@ enum class AshLayoutSize {
|
||||
|
||||
ASH_EXPORT gfx::Size GetAshLayoutSize(AshLayoutSize size);
|
||||
|
||||
#endif // ASH_ASH_LAYOUT_CONSTANTS_H_
|
||||
#endif // ASH_COMMON_ASH_LAYOUT_CONSTANTS_H_
|
||||
@ -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/ash_switches.h"
|
||||
#include "ash/common/ash_switches.h"
|
||||
|
||||
#include "base/command_line.h"
|
||||
#include "base/sys_info.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_ASH_SWITCHES_H_
|
||||
#define ASH_ASH_SWITCHES_H_
|
||||
#ifndef ASH_COMMON_ASH_SWITCHES_H_
|
||||
#define ASH_COMMON_ASH_SWITCHES_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
|
||||
@ -50,4 +50,4 @@ ASH_EXPORT bool DockedWindowsEnabled();
|
||||
} // namespace switches
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_ASH_SWITCHES_H_
|
||||
#endif // ASH_COMMON_ASH_SWITCHES_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_ASH_VIEW_IDS_H_
|
||||
#define ASH_ASH_VIEW_IDS_H_
|
||||
#ifndef ASH_COMMON_ASH_VIEW_IDS_H_
|
||||
#define ASH_COMMON_ASH_VIEW_IDS_H_
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -20,4 +20,4 @@ enum ViewID {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_ASH_VIEW_IDS_H_
|
||||
#endif // ASH_COMMON_ASH_VIEW_IDS_H_
|
||||
@ -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/cast_config_controller.h"
|
||||
#include "ash/common/cast_config_controller.h"
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@ -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_CAST_CONFIG_CONTROLLER_H_
|
||||
#define ASH_CAST_CONFIG_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_CAST_CONFIG_CONTROLLER_H_
|
||||
#define ASH_COMMON_CAST_CONFIG_CONTROLLER_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
@ -66,4 +66,4 @@ class CastConfigController : public ash::mojom::CastConfig,
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_CAST_CONFIG_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_CAST_CONFIG_CONTROLLER_H_
|
||||
@ -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/default_accessibility_delegate.h"
|
||||
#include "ash/common/default_accessibility_delegate.h"
|
||||
|
||||
#include <limits>
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef ASH_DEFAULT_ACCESSIBILITY_DELEGATE_H_
|
||||
#define ASH_DEFAULT_ACCESSIBILITY_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_DEFAULT_ACCESSIBILITY_DELEGATE_H_
|
||||
#define ASH_COMMON_DEFAULT_ACCESSIBILITY_DELEGATE_H_
|
||||
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/accessibility_types.h"
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/common/accessibility_delegate.h"
|
||||
#include "ash/common/accessibility_types.h"
|
||||
#include "base/macros.h"
|
||||
|
||||
namespace ash {
|
||||
@ -78,4 +78,4 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_DEFAULT_ACCESSIBILITY_DELEGATE_H_
|
||||
#endif // ASH_COMMON_DEFAULT_ACCESSIBILITY_DELEGATE_H_
|
||||
@ -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/devtools/ash_devtools_css_agent.h"
|
||||
#include "ash/common/devtools/ash_devtools_css_agent.h"
|
||||
|
||||
#include "ash/wm_window.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "base/strings/string_util.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_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_
|
||||
#define ASH_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_
|
||||
#ifndef ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_
|
||||
#define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_
|
||||
|
||||
#include "ash/devtools/ash_devtools_dom_agent.h"
|
||||
#include "ash/common/devtools/ash_devtools_dom_agent.h"
|
||||
#include "components/ui_devtools/CSS.h"
|
||||
#include "ui/views/widget/widget_observer.h"
|
||||
|
||||
@ -54,4 +54,4 @@ class ASH_EXPORT AshDevToolsCSSAgent
|
||||
} // namespace devtools
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_H_
|
||||
#endif // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_CSS_AGENT_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.
|
||||
|
||||
#include "ash/devtools/ash_devtools_dom_agent.h"
|
||||
#include "ash/common/devtools/ash_devtools_dom_agent.h"
|
||||
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "components/ui_devtools/devtools_server.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "ui/display/display.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_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
|
||||
#define ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
|
||||
#ifndef ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
|
||||
#define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
|
||||
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "components/ui_devtools/DOM.h"
|
||||
@ -152,4 +152,4 @@ class ASH_EXPORT AshDevToolsDOMAgent
|
||||
} // namespace devtools
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
|
||||
#endif // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
|
||||
@ -2,12 +2,12 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/devtools/ash_devtools_css_agent.h"
|
||||
#include "ash/devtools/ash_devtools_dom_agent.h"
|
||||
#include "ash/common/devtools/ash_devtools_css_agent.h"
|
||||
#include "ash/common/devtools/ash_devtools_dom_agent.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 "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
#include "ui/display/display.h"
|
||||
@ -2,12 +2,12 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/focus_cycler.h"
|
||||
#include "ash/common/focus_cycler.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_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "ui/views/accessible_pane_view.h"
|
||||
#include "ui/views/focus/focus_search.h"
|
||||
#include "ui/views/widget/widget.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_FOCUS_CYCLER_H_
|
||||
#define ASH_FOCUS_CYCLER_H_
|
||||
#ifndef ASH_COMMON_FOCUS_CYCLER_H_
|
||||
#define ASH_COMMON_FOCUS_CYCLER_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
@ -53,4 +53,4 @@ class ASH_EXPORT FocusCycler {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_FOCUS_CYCLER_H_
|
||||
#endif // ASH_COMMON_FOCUS_CYCLER_H_
|
||||
@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef ASH_GPU_SUPPORT_H_
|
||||
#define ASH_GPU_SUPPORT_H_
|
||||
#ifndef ASH_COMMON_GPU_SUPPORT_H_
|
||||
#define ASH_COMMON_GPU_SUPPORT_H_
|
||||
|
||||
#include <list>
|
||||
|
||||
@ -30,4 +30,4 @@ class ASH_EXPORT GPUSupport {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_GPU_SUPPORT_H_
|
||||
#endif // ASH_COMMON_GPU_SUPPORT_H_
|
||||
@ -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/gpu_support_stub.h"
|
||||
#include "ash/common/gpu_support_stub.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -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_GPU_SUPPORT_STUB_H_
|
||||
#define ASH_GPU_SUPPORT_STUB_H_
|
||||
#ifndef ASH_COMMON_GPU_SUPPORT_STUB_H_
|
||||
#define ASH_COMMON_GPU_SUPPORT_STUB_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/gpu_support.h"
|
||||
#include "ash/common/gpu_support.h"
|
||||
#include "base/macros.h"
|
||||
|
||||
namespace ash {
|
||||
@ -28,4 +28,4 @@ class ASH_EXPORT GPUSupportStub : public GPUSupport {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_GPU_SUPPORT_STUB_H_
|
||||
#endif // ASH_COMMON_GPU_SUPPORT_STUB_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_IME_CONTROL_DELEGATE_H_
|
||||
#define ASH_IME_CONTROL_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_IME_CONTROL_DELEGATE_H_
|
||||
#define ASH_COMMON_IME_CONTROL_DELEGATE_H_
|
||||
|
||||
namespace ui {
|
||||
class Accelerator;
|
||||
@ -37,4 +37,4 @@ class ImeControlDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_IME_CONTROL_DELEGATE_H_
|
||||
#endif // ASH_COMMON_IME_CONTROL_DELEGATE_H_
|
||||
@ -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/key_event_watcher.h"
|
||||
#include "ash/common/key_event_watcher.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -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_KEY_EVENT_WATCHER_H_
|
||||
#define ASH_KEY_EVENT_WATCHER_H_
|
||||
#ifndef ASH_COMMON_KEY_EVENT_WATCHER_H_
|
||||
#define ASH_COMMON_KEY_EVENT_WATCHER_H_
|
||||
|
||||
#include <map>
|
||||
|
||||
@ -46,4 +46,4 @@ class ASH_EXPORT KeyEventWatcher {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_KEY_EVENT_WATCHER_H_
|
||||
#endif // ASH_COMMON_KEY_EVENT_WATCHER_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.
|
||||
|
||||
#include "ash/keyboard/keyboard_ui.h"
|
||||
#include "ash/common/keyboard/keyboard_ui.h"
|
||||
|
||||
#include "ash/accessibility_delegate.h"
|
||||
#include "ash/keyboard/keyboard_ui_observer.h"
|
||||
#include "ash/common/accessibility_delegate.h"
|
||||
#include "ash/common/keyboard/keyboard_ui_observer.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/system/accessibility_observer.h"
|
||||
#include "ash/system/tray/system_tray_notifier.h"
|
||||
#include "ash/system/tray_accessibility.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "ui/keyboard/keyboard_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_KEYBOARD_KEYBOARD_UI_H_
|
||||
#define ASH_KEYBOARD_KEYBOARD_UI_H_
|
||||
#ifndef ASH_COMMON_KEYBOARD_KEYBOARD_UI_H_
|
||||
#define ASH_COMMON_KEYBOARD_KEYBOARD_UI_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -47,4 +47,4 @@ class ASH_EXPORT KeyboardUI {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_KEYBOARD_KEYBOARD_UI_H_
|
||||
#endif // ASH_COMMON_KEYBOARD_KEYBOARD_UI_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_KEYBOARD_KEYBOARD_UI_OBSERVER_H_
|
||||
#define ASH_KEYBOARD_KEYBOARD_UI_OBSERVER_H_
|
||||
#ifndef ASH_COMMON_KEYBOARD_KEYBOARD_UI_OBSERVER_H_
|
||||
#define ASH_COMMON_KEYBOARD_KEYBOARD_UI_OBSERVER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/macros.h"
|
||||
@ -20,4 +20,4 @@ class ASH_EXPORT KeyboardUIObserver {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_KEYBOARD_KEYBOARD_UI_OBSERVER_H_
|
||||
#endif // ASH_COMMON_KEYBOARD_KEYBOARD_UI_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_LOGIN_STATUS_H_
|
||||
#define ASH_LOGIN_STATUS_H_
|
||||
#ifndef ASH_COMMON_LOGIN_STATUS_H_
|
||||
#define ASH_COMMON_LOGIN_STATUS_H_
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -21,4 +21,4 @@ enum class LoginStatus {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_LOGIN_STATUS_H_
|
||||
#endif // ASH_COMMON_LOGIN_STATUS_H_
|
||||
@ -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/material_design/material_design_controller.h"
|
||||
#include "ash/common/material_design/material_design_controller.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
@ -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_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
|
||||
#define ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
|
||||
#define ASH_COMMON_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/macros.h"
|
||||
@ -32,4 +32,4 @@ class ASH_EXPORT MaterialDesignController {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
|
||||
@ -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/media_controller.h"
|
||||
#include "ash/common/media_controller.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -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_MEDIA_CONTROLLER_H_
|
||||
#define ASH_MEDIA_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_MEDIA_CONTROLLER_H_
|
||||
#define ASH_COMMON_MEDIA_CONTROLLER_H_
|
||||
|
||||
#include "ash/public/interfaces/media.mojom.h"
|
||||
#include "base/macros.h"
|
||||
@ -63,4 +63,4 @@ class MediaController : public mojom::MediaController,
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_MEDIA_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_MEDIA_CONTROLLER_H_
|
||||
@ -2,24 +2,24 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/mojo_interface_factory.h"
|
||||
#include "ash/common/mojo_interface_factory.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include "ash/accelerators/accelerator_controller.h"
|
||||
#include "ash/cast_config_controller.h"
|
||||
#include "ash/media_controller.h"
|
||||
#include "ash/new_window_controller.h"
|
||||
#include "ash/session/session_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/shell_delegate.h"
|
||||
#include "ash/common/shutdown_controller.h"
|
||||
#include "ash/common/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/shelf/shelf_controller.h"
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/shutdown_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/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "base/bind.h"
|
||||
#include "services/service_manager/public/cpp/interface_registry.h"
|
||||
#include "ui/app_list/presenter/app_list.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_MOJO_INTERFACE_FACTORY_H_
|
||||
#define ASH_MOJO_INTERFACE_FACTORY_H_
|
||||
#ifndef ASH_COMMON_MOJO_INTERFACE_FACTORY_H_
|
||||
#define ASH_COMMON_MOJO_INTERFACE_FACTORY_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/macros.h"
|
||||
@ -32,4 +32,4 @@ ASH_EXPORT void RegisterInterfaces(
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_MOJO_INTERFACE_FACTORY_H_
|
||||
#endif // ASH_COMMON_MOJO_INTERFACE_FACTORY_H_
|
||||
@ -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/multi_profile_uma.h"
|
||||
#include "ash/common/multi_profile_uma.h"
|
||||
|
||||
#include "base/metrics/histogram_macros.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_MULTI_PROFILE_UMA_H_
|
||||
#define ASH_MULTI_PROFILE_UMA_H_
|
||||
#ifndef ASH_COMMON_MULTI_PROFILE_UMA_H_
|
||||
#define ASH_COMMON_MULTI_PROFILE_UMA_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/macros.h"
|
||||
@ -82,4 +82,4 @@ class ASH_EXPORT MultiProfileUMA {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_MULTI_PROFILE_UMA_H_
|
||||
#endif // ASH_COMMON_MULTI_PROFILE_UMA_H_
|
||||
@ -6,9 +6,9 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/window_properties.h"
|
||||
#include "ash/test/ash_test.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "ui/aura/client/aura_constants.h"
|
||||
@ -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/new_window_controller.h"
|
||||
#include "ash/common/new_window_controller.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@ -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_NEW_WINDOW_CONTROLLER_H_
|
||||
#define ASH_NEW_WINDOW_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_NEW_WINDOW_CONTROLLER_H_
|
||||
#define ASH_COMMON_NEW_WINDOW_CONTROLLER_H_
|
||||
|
||||
#include "ash/public/interfaces/new_window.mojom.h"
|
||||
#include "base/macros.h"
|
||||
@ -47,4 +47,4 @@ class NewWindowController : public mojom::NewWindowController,
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_NEW_WINDOW_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_NEW_WINDOW_CONTROLLER_H_
|
||||
@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef ASH_PALETTE_DELEGATE_H_
|
||||
#define ASH_PALETTE_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_PALETTE_DELEGATE_H_
|
||||
#define ASH_COMMON_PALETTE_DELEGATE_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/callback.h"
|
||||
@ -60,4 +60,4 @@ class PaletteDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_PALETTE_DELEGATE_H_
|
||||
#endif // ASH_COMMON_PALETTE_DELEGATE_H_
|
||||
@ -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/scoped_root_window_for_new_windows.h"
|
||||
#include "ash/common/scoped_root_window_for_new_windows.h"
|
||||
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "base/logging.h"
|
||||
|
||||
namespace ash {
|
||||
@ -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_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_
|
||||
#define ASH_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_
|
||||
#ifndef ASH_COMMON_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_
|
||||
#define ASH_COMMON_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/macros.h"
|
||||
@ -28,4 +28,4 @@ class ASH_EXPORT ScopedRootWindowForNewWindows {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_H_
|
||||
#endif // ASH_COMMON_SCOPED_ROOT_WINDOW_FOR_NEW_WINDOWS_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.
|
||||
|
||||
#include "ash/session/session_controller.h"
|
||||
#include "ash/common/session/session_controller.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "ash/session/session_state_observer.h"
|
||||
#include "ash/common/session/session_state_observer.h"
|
||||
#include "base/bind.h"
|
||||
#include "base/bind_helpers.h"
|
||||
#include "components/signin/core/account_id/account_id.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_SESSION_SESSION_CONTROLLER_H_
|
||||
#define ASH_SESSION_SESSION_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_SESSION_SESSION_CONTROLLER_H_
|
||||
#define ASH_COMMON_SESSION_SESSION_CONTROLLER_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -125,4 +125,4 @@ class ASH_EXPORT SessionController
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SESSION_SESSION_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_SESSION_SESSION_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.
|
||||
|
||||
#include "ash/session/session_controller.h"
|
||||
#include "ash/common/session/session_controller.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "ash/common/session/session_controller.h"
|
||||
#include "ash/common/session/session_state_observer.h"
|
||||
#include "ash/public/interfaces/session_controller.mojom.h"
|
||||
#include "ash/session/session_controller.h"
|
||||
#include "ash/session/session_state_observer.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "components/user_manager/user_type.h"
|
||||
@ -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/session/session_state_delegate.h"
|
||||
#include "ash/common/session/session_state_delegate.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -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_SESSION_SESSION_STATE_DELEGATE_H_
|
||||
#define ASH_SESSION_SESSION_STATE_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_SESSION_SESSION_STATE_DELEGATE_H_
|
||||
#define ASH_COMMON_SESSION_SESSION_STATE_DELEGATE_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/public/cpp/session_types.h"
|
||||
@ -102,4 +102,4 @@ class ASH_EXPORT SessionStateDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SESSION_SESSION_STATE_DELEGATE_H_
|
||||
#endif // ASH_COMMON_SESSION_SESSION_STATE_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.
|
||||
|
||||
#include "ash/session/session_state_observer.h"
|
||||
#include "ash/common/session/session_state_observer.h"
|
||||
|
||||
#include "ash/session/session_state_delegate.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/common/session/session_state_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -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_SESSION_SESSION_STATE_OBSERVER_H_
|
||||
#define ASH_SESSION_SESSION_STATE_OBSERVER_H_
|
||||
#ifndef ASH_COMMON_SESSION_SESSION_STATE_OBSERVER_H_
|
||||
#define ASH_COMMON_SESSION_SESSION_STATE_OBSERVER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "base/macros.h"
|
||||
@ -42,4 +42,4 @@ class ASH_EXPORT ScopedSessionStateObserver {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SESSION_SESSION_STATE_OBSERVER_H_
|
||||
#endif // ASH_COMMON_SESSION_SESSION_STATE_OBSERVER_H_
|
||||
@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef ASH_SHELL_DELEGATE_H_
|
||||
#define ASH_SHELL_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_SHELL_DELEGATE_H_
|
||||
#define ASH_COMMON_SHELL_DELEGATE_H_
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@ -140,4 +140,4 @@ class ASH_EXPORT ShellDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SHELL_DELEGATE_H_
|
||||
#endif // ASH_COMMON_SHELL_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_SHELL_OBSERVER_H_
|
||||
#define ASH_SHELL_OBSERVER_H_
|
||||
#ifndef ASH_COMMON_SHELL_OBSERVER_H_
|
||||
#define ASH_COMMON_SHELL_OBSERVER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/login_status.h"
|
||||
#include "ash/common/login_status.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -79,4 +79,4 @@ class ASH_EXPORT ShellObserver {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SHELL_OBSERVER_H_
|
||||
#endif // ASH_COMMON_SHELL_OBSERVER_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.
|
||||
|
||||
#include "ash/shutdown_controller.h"
|
||||
#include "ash/common/shutdown_controller.h"
|
||||
|
||||
#include "ash/shell_delegate.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/common/shell_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "base/sys_info.h"
|
||||
#include "chromeos/dbus/dbus_thread_manager.h"
|
||||
#include "chromeos/dbus/power_manager_client.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_SHUTDOWN_CONTROLLER_H_
|
||||
#define ASH_SHUTDOWN_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_SHUTDOWN_CONTROLLER_H_
|
||||
#define ASH_COMMON_SHUTDOWN_CONTROLLER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/public/interfaces/shutdown.mojom.h"
|
||||
@ -46,4 +46,4 @@ class ASH_EXPORT ShutdownController
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_SHUTDOWN_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_SHUTDOWN_CONTROLLER_H_
|
||||
@ -2,20 +2,20 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/common/wallpaper/wallpaper_controller.h"
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "ash/ash_switches.h"
|
||||
#include "ash/common/ash_switches.h"
|
||||
#include "ash/common/wallpaper/wallpaper_controller_observer.h"
|
||||
#include "ash/common/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/common/wallpaper/wallpaper_view.h"
|
||||
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/wallpaper/wallpaper_controller_observer.h"
|
||||
#include "ash/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/wallpaper/wallpaper_view.h"
|
||||
#include "ash/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/bind.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/logging.h"
|
||||
@ -2,15 +2,15 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
|
||||
#define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_
|
||||
#define ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/common/shell_observer.h"
|
||||
#include "ash/common/wm_display_observer.h"
|
||||
#include "ash/public/interfaces/wallpaper.mojom.h"
|
||||
#include "ash/shell_observer.h"
|
||||
#include "ash/wm_display_observer.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/observer_list.h"
|
||||
@ -186,4 +186,4 @@ class ASH_EXPORT WallpaperController
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_
|
||||
6
ash/wallpaper/wallpaper_controller_observer.h → ash/common/wallpaper/wallpaper_controller_observer.h
6
ash/wallpaper/wallpaper_controller_observer.h → ash/common/wallpaper/wallpaper_controller_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_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
|
||||
#define ASH_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
|
||||
#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
|
||||
#define ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
|
||||
@ -25,4 +25,4 @@ class ASH_EXPORT WallpaperControllerObserver {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
|
||||
#endif // ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_OBSERVER_H_
|
||||
@ -2,19 +2,19 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "ash/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/common/wallpaper/wallpaper_controller.h"
|
||||
|
||||
#include <cmath>
|
||||
#include <cstdlib>
|
||||
|
||||
#include "ash/common/wallpaper/wallpaper_view.h"
|
||||
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/public/cpp/shell_window_ids.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/test/ash_test_base.h"
|
||||
#include "ash/test/test_wallpaper_delegate.h"
|
||||
#include "ash/wallpaper/wallpaper_view.h"
|
||||
#include "ash/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "base/message_loop/message_loop.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "base/strings/stringprintf.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_WALLPAPER_WALLPAPER_DELEGATE_H_
|
||||
#define ASH_WALLPAPER_WALLPAPER_DELEGATE_H_
|
||||
#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_DELEGATE_H_
|
||||
#define ASH_COMMON_WALLPAPER_WALLPAPER_DELEGATE_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
|
||||
@ -53,4 +53,4 @@ class ASH_EXPORT WallpaperDelegate {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_WALLPAPER_WALLPAPER_DELEGATE_H_
|
||||
#endif // ASH_COMMON_WALLPAPER_WALLPAPER_DELEGATE_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.
|
||||
|
||||
#include "ash/wallpaper/wallpaper_view.h"
|
||||
#include "ash/common/wallpaper/wallpaper_view.h"
|
||||
|
||||
#include "ash/common/session/session_state_delegate.h"
|
||||
#include "ash/common/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/common/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/session/session_state_delegate.h"
|
||||
#include "ash/wallpaper/wallpaper_controller.h"
|
||||
#include "ash/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/wm/overview/window_selector_controller.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "ui/display/display.h"
|
||||
#include "ui/display/manager/managed_display_info.h"
|
||||
#include "ui/display/screen.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_WALLPAPER_WALLPAPER_VIEW_H_
|
||||
#define ASH_WALLPAPER_WALLPAPER_VIEW_H_
|
||||
#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_VIEW_H_
|
||||
#define ASH_COMMON_WALLPAPER_WALLPAPER_VIEW_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -40,4 +40,4 @@ views::Widget* CreateWallpaper(WmWindow* root_window, int container_id);
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_WALLPAPER_WALLPAPER_VIEW_H_
|
||||
#endif // ASH_COMMON_WALLPAPER_WALLPAPER_VIEW_H_
|
||||
8
ash/wallpaper/wallpaper_widget_controller.cc → ash/common/wallpaper/wallpaper_widget_controller.cc
8
ash/wallpaper/wallpaper_widget_controller.cc → ash/common/wallpaper/wallpaper_widget_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/wallpaper/wallpaper_widget_controller.h"
|
||||
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
#include "ash/common/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "ash/root_window_controller.h"
|
||||
#include "ash/wallpaper/wallpaper_delegate.h"
|
||||
#include "ash/wm_shell.h"
|
||||
#include "ash/wm_window.h"
|
||||
#include "ui/compositor/layer_animation_observer.h"
|
||||
#include "ui/compositor/scoped_layer_animation_settings.h"
|
||||
#include "ui/views/widget/widget.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_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
|
||||
#define ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
|
||||
#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
|
||||
#define ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -98,4 +98,4 @@ class ASH_EXPORT AnimatingWallpaperWidgetController {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
|
||||
#endif // ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_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_WM_ACTIVATION_OBSERVER_H_
|
||||
#define ASH_WM_ACTIVATION_OBSERVER_H_
|
||||
#ifndef ASH_COMMON_WM_ACTIVATION_OBSERVER_H_
|
||||
#define ASH_COMMON_WM_ACTIVATION_OBSERVER_H_
|
||||
|
||||
#include "ash/ash_export.h"
|
||||
|
||||
@ -29,4 +29,4 @@ class ASH_EXPORT WmActivationObserver {
|
||||
|
||||
} // namespace ash
|
||||
|
||||
#endif // ASH_WM_ACTIVATION_OBSERVER_H_
|
||||
#endif // ASH_COMMON_WM_ACTIVATION_OBSERVER_H_
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user