diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc index 924eb396ee3a6c..91594811992b71 100644 --- a/apps/shell/browser/shell_browser_main_parts.cc +++ b/apps/shell/browser/shell_browser_main_parts.cc @@ -21,8 +21,8 @@ #include "extensions/browser/extension_system.h" #include "extensions/browser/renderer_startup_helper.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_screen.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/screen.h" diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index f89a4aa19f8b98..6961999710e3a6 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -57,7 +57,7 @@ #include "base/command_line.h" #include "base/metrics/user_metrics.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" #include "ui/compositor/debug_utils.h" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index bd4a9d09297a21..b59e901cd47cda 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -22,10 +22,10 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc index 6088dfec9df11b..0395ee7aabd0c1 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -16,7 +16,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc index 1ce80c76de521a..7e043103efe5f2 100644 --- a/ash/accelerators/accelerator_filter.cc +++ b/ash/accelerators/accelerator_filter.cc @@ -7,7 +7,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" #include "ash/wm/window_state.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" #include "ui/events/event.h" diff --git a/ash/accelerators/key_hold_detector.cc b/ash/accelerators/key_hold_detector.cc index 4b99820cdfa93b..95ded1a0cf1bcd 100644 --- a/ash/accelerators/key_hold_detector.cc +++ b/ash/accelerators/key_hold_detector.cc @@ -11,7 +11,7 @@ #include "ash/shell.h" #include "base/message_loop/message_loop.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/events/event_dispatcher.h" diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc index 3749c7f317c908..67f528bc9858aa 100644 --- a/ash/accelerators/nested_dispatcher_controller_unittest.cc +++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc @@ -11,9 +11,9 @@ #include "base/event_types.h" #include "base/message_loop/message_loop.h" #include "ui/aura/client/dispatcher_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/event_constants.h" #include "ui/events/event_utils.h" diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc index accd9b11e6f425..062a9c3d686a55 100644 --- a/ash/autoclick/autoclick_controller.cc +++ b/ash/autoclick/autoclick_controller.cc @@ -8,7 +8,7 @@ #include "ash/wm/coordinate_conversion.h" #include "base/timer/timer.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/events/event_handler.h" diff --git a/ash/autoclick/autoclick_unittest.cc b/ash/autoclick/autoclick_unittest.cc index 4310b1ee0c45d4..ff387aad9f0f91 100644 --- a/ash/autoclick/autoclick_unittest.cc +++ b/ash/autoclick/autoclick_unittest.cc @@ -5,10 +5,10 @@ #include "ash/autoclick/autoclick_controller.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/events/event_handler.h" diff --git a/ash/cancel_mode.cc b/ash/cancel_mode.cc index 64c352ef0df3e1..8ef7eb164008ac 100644 --- a/ash/cancel_mode.cc +++ b/ash/cancel_mode.cc @@ -6,7 +6,7 @@ #include "ash/root_window_controller.h" #include "ash/shell.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" namespace ash { diff --git a/ash/debug.cc b/ash/debug.cc index a54759bfafdd95..68ff5903f485a9 100644 --- a/ash/debug.cc +++ b/ash/debug.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "cc/debug/layer_tree_debug_state.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/compositor.h" namespace ash { diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index 81174c2db2b087..1aee949b6ede37 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -25,8 +25,8 @@ #include "base/threading/worker_pool.h" #include "content/public/browser/browser_thread.h" #include "grit/ash_resources.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/image/image_skia.h" diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 537112272a50f4..3c41f3d74bc3f1 100644 --- a/ash/desktop_background/desktop_background_controller_unittest.cc +++ b/ash/desktop_background/desktop_background_controller_unittest.cc @@ -27,7 +27,7 @@ #include "content/public/test/test_utils.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/test/layer_animator_test_controller.h" #include "ui/gfx/codec/jpeg_codec.h" diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index acf4e3bcded7be..d1c30785937ee0 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -18,7 +18,7 @@ #include "ash/wm/window_animations.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc index 8d0aa6738185e7..ca2fd03f817559 100644 --- a/ash/desktop_background/desktop_background_widget_controller.cc +++ b/ash/desktop_background/desktop_background_widget_controller.cc @@ -8,7 +8,7 @@ #include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/root_window_controller.h" #include "ash/shell.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/widget/widget.h" diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index 92f78bcde31695..5fef4685f7c2c1 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -16,8 +16,8 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/gfx/display.h" #include "ui/gfx/insets.h" diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc index 4e20022f5c33c1..42d823d72eec92 100644 --- a/ash/display/cursor_window_controller.cc +++ b/ash/display/cursor_window_controller.cc @@ -10,8 +10,8 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursors_aura.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index bb78558b17c6d2..138340037ebd9b 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -28,9 +28,9 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/aura/window_tracker.h" #include "ui/compositor/compositor.h" diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index cb9b3464b59b8a..bf2eeb3f048835 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -22,8 +22,8 @@ #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/events/event_handler.h" #include "ui/gfx/display.h" diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 93fa285ca40243..70d2c1889af729 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -15,8 +15,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/gfx/display_observer.h" #include "ui/gfx/display.h" diff --git a/ash/display/event_transformation_handler.cc b/ash/display/event_transformation_handler.cc index 0565595ccd0eff..32ab6e836b28d4 100644 --- a/ash/display/event_transformation_handler.cc +++ b/ash/display/event_transformation_handler.cc @@ -9,8 +9,8 @@ #include "ash/shell.h" #include "ash/wm/coordinate_conversion.h" #include "ash/wm/window_util.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/dip_util.h" #include "ui/events/event.h" #include "ui/gfx/display.h" diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index f946028ab7f123..3cb77be9e558f8 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -21,9 +21,9 @@ #include "ash/shell.h" #include "base/strings/stringprintf.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/layout.h" #include "ui/compositor/reflector.h" #include "ui/gfx/canvas.h" diff --git a/ash/display/mirror_window_controller_unittest.cc b/ash/display/mirror_window_controller_unittest.cc index 0889fee9a28792..dc3c3578406efb 100644 --- a/ash/display/mirror_window_controller_unittest.cc +++ b/ash/display/mirror_window_controller_unittest.cc @@ -12,11 +12,11 @@ #include "ash/test/mirror_window_test_api.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" namespace ash { diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc index 89946c77024442..3710d73c94af21 100644 --- a/ash/display/mouse_cursor_event_filter.cc +++ b/ash/display/mouse_cursor_event_filter.cc @@ -13,8 +13,8 @@ #include "ash/wm/coordinate_conversion.h" #include "ash/wm/window_util.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/layout.h" #include "ui/compositor/dip_util.h" #include "ui/events/event.h" diff --git a/ash/display/mouse_cursor_event_filter_unittest.cc b/ash/display/mouse_cursor_event_filter_unittest.cc index be7dac52bae723..0f023588fd8879 100644 --- a/ash/display/mouse_cursor_event_filter_unittest.cc +++ b/ash/display/mouse_cursor_event_filter_unittest.cc @@ -10,7 +10,7 @@ #include "ash/display/display_layout_store.h" #include "ash/display/display_manager.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" diff --git a/ash/display/output_configurator_animation.cc b/ash/display/output_configurator_animation.cc index de43f97fe9a909..fa84a0d7f31488 100644 --- a/ash/display/output_configurator_animation.cc +++ b/ash/display/output_configurator_animation.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/stl_util.h" #include "base/time/time.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animation_sequence.h" diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc index 7f808ddbc149b3..8774852a76c0a8 100644 --- a/ash/display/root_window_transformers.cc +++ b/ash/display/root_window_transformers.cc @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/utils/SkMatrix44.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/compositor/dip_util.h" #include "ui/gfx/display.h" diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc index 9ace7dfa983889..954deb8d7ba247 100644 --- a/ash/display/root_window_transformers_unittest.cc +++ b/ash/display/root_window_transformers_unittest.cc @@ -16,9 +16,9 @@ #include "ash/test/mirror_window_test_api.h" #include "base/synchronization/waitable_event.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/events/event_handler.h" #include "ui/gfx/display.h" diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc index 7effb38ded09ef..9bdb920a1d8502 100644 --- a/ash/display/screen_ash.cc +++ b/ash/display/screen_ash.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index 0e11a2982968e9..13681c01f1e923 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -15,7 +15,7 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/compositor/dip_util.h" #include "ui/gfx/display.h" diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc index 4f6f7d0bd0547a..d51ec0a3e833af 100644 --- a/ash/display/screen_position_controller_unittest.cc +++ b/ash/display/screen_position_controller_unittest.cc @@ -10,8 +10,8 @@ #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/layout.h" #include "ui/gfx/screen.h" diff --git a/ash/display/shared_display_edge_indicator.cc b/ash/display/shared_display_edge_indicator.cc index 0e16cee0fdb877..02af8312a1570b 100644 --- a/ash/display/shared_display_edge_indicator.cc +++ b/ash/display/shared_display_edge_indicator.cc @@ -9,7 +9,7 @@ #include "ash/wm/coordinate_conversion.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" diff --git a/ash/display/virtual_keyboard_window_controller.cc b/ash/display/virtual_keyboard_window_controller.cc index fdc6348eb40be7..3977ce549e9b02 100644 --- a/ash/display/virtual_keyboard_window_controller.cc +++ b/ash/display/virtual_keyboard_window_controller.cc @@ -16,8 +16,8 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/keyboard/keyboard_controller.h" namespace ash { diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 05a36bebd16e70..9ea8672aeaacdb 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -14,9 +14,9 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/hit_test.h" diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 241edb26217fd8..85821a769b1697 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -12,8 +12,8 @@ #include "base/location.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/dragdrop/drag_drop_types.h" diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc index 28295ff1005e5b..bf20f7051167c0 100644 --- a/ash/drag_drop/drag_drop_interactive_uitest.cc +++ b/ash/drag_drop/drag_drop_interactive_uitest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/test/ui_controls.h" #include "ui/views/view.h" diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index c58aa5611963b2..48badf3dee2473 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -9,8 +9,8 @@ #include "ash/wm/coordinate_conversion.h" #include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc index 41eb089eccd7a8..dbac80ecc47ac1 100644 --- a/ash/drag_drop/drag_drop_tracker_unittest.cc +++ b/ash/drag_drop/drag_drop_tracker_unittest.cc @@ -8,9 +8,9 @@ #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace ash { namespace test { diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 67cd9198d5d8ee..0a7efa3a4ddef4 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -18,11 +18,11 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/test/window_test_api.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor.h" #include "ui/events/event_handler.h" #include "ui/gfx/display.h" diff --git a/ash/first_run/desktop_cleaner.cc b/ash/first_run/desktop_cleaner.cc index cf0ffa6f974038..9e6da0ff1b4d25 100644 --- a/ash/first_run/desktop_cleaner.cc +++ b/ash/first_run/desktop_cleaner.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/message_center/message_center.h" diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 3bdc451783448f..66be1ed258c7e2 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -15,10 +15,10 @@ #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/widget/widget.h" diff --git a/ash/high_contrast/high_contrast_controller.cc b/ash/high_contrast/high_contrast_controller.cc index 487c41bf47c99c..03618c56ba3c0b 100644 --- a/ash/high_contrast/high_contrast_controller.cc +++ b/ash/high_contrast/high_contrast_controller.cc @@ -5,7 +5,7 @@ #include "ash/high_contrast/high_contrast_controller.h" #include "ash/shell.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" namespace ash { diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.cc b/ash/keyboard_overlay/keyboard_overlay_delegate.cc index d591c9b676a4de..266319ab133202 100644 --- a/ash/keyboard_overlay/keyboard_overlay_delegate.cc +++ b/ash/keyboard_overlay/keyboard_overlay_delegate.cc @@ -13,7 +13,7 @@ #include "base/values.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" #include "ui/views/controls/webview/web_dialog_view.h" diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 77428dcaad1763..1ffec455735214 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -13,9 +13,9 @@ #include "base/command_line.h" #include "base/synchronization/waitable_event.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc index a03d3c557fe173..98a6b08ddc9922 100644 --- a/ash/magnifier/magnification_controller_unittest.cc +++ b/ash/magnifier/magnification_controller_unittest.cc @@ -10,8 +10,8 @@ #include "base/strings/stringprintf.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/screen.h" diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc index a24ba51d4e95e5..681e4438b86962 100644 --- a/ash/magnifier/partial_magnification_controller.cc +++ b/ash/magnifier/partial_magnification_controller.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/corewm/compound_event_filter.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 91b46df1025b3e..51bd3ade55cca0 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -49,9 +49,9 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/tooltip_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tracker.h" #include "ui/base/hit_test.h" diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 849ce070fde1bf..b6a1a2916e1d88 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -13,8 +13,8 @@ #include "ash/system/user/login_status.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" class SkBitmap; diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index be982d4c3cf1db..9835cc5326d5d5 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -19,12 +19,12 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_handler.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/keyboard/keyboard_controller_proxy.h" #include "ui/keyboard/keyboard_switches.h" diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc index b6e3b915743794..f3df896f2f5921 100644 --- a/ash/root_window_settings.cc +++ b/ash/root_window_settings.cc @@ -4,7 +4,7 @@ #include "ash/root_window_settings.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/gfx/display.h" diff --git a/ash/screen_util.cc b/ash/screen_util.cc index 371c371efd9699..9d7404c1bb2f8f 100644 --- a/ash/screen_util.cc +++ b/ash/screen_util.cc @@ -13,7 +13,7 @@ #include "ash/wm/coordinate_conversion.h" #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc index 74d31b65eb63fc..9ab36005d8b9dc 100644 --- a/ash/screen_util_unittest.cc +++ b/ash/screen_util_unittest.cc @@ -11,8 +11,8 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc index af953f71d3f6c3..a9749473c92207 100644 --- a/ash/screensaver/screensaver_view.cc +++ b/ash/screensaver/screensaver_view.cc @@ -11,7 +11,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/layout/fill_layout.h" diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc index 05106ec21e9b7e..8a58d8740114ee 100644 --- a/ash/shelf/overflow_bubble.cc +++ b/ash/shelf/overflow_bubble.cc @@ -12,7 +12,7 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc index 0beb2d5d66eee7..4f433cea70dc03 100644 --- a/ash/shelf/shelf.cc +++ b/ash/shelf/shelf.cc @@ -25,8 +25,8 @@ #include "ash/wm/window_properties.h" #include "grit/ash_resources.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 1639fc80e812ed..b1fcb8f699a1fe 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -38,7 +38,7 @@ #include "base/strings/string_util.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index 928ff3ea3d4cbb..8ee70eccd3ffbe 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -27,9 +27,9 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc index dd20a178a2d9dd..48b943f7ced91f 100644 --- a/ash/shelf/shelf_tooltip_manager.cc +++ b/ash/shelf/shelf_tooltip_manager.cc @@ -13,8 +13,8 @@ #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/gfx/insets.h" diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc index 2294ba4613c0fc..7ce38dfc1d8941 100644 --- a/ash/shelf/shelf_tooltip_manager_unittest.cc +++ b/ash/shelf/shelf_tooltip_manager_unittest.cc @@ -14,7 +14,7 @@ #include "ash/wm/window_util.h" #include "base/strings/string16.h" #include "base/time/time.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/events/event_handler.h" diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc index 475ee83da479ea..14b1b950b35f3d 100644 --- a/ash/shelf/shelf_unittest.cc +++ b/ash/shelf/shelf_unittest.cc @@ -14,7 +14,7 @@ #include "ash/test/shelf_view_test_api.h" #include "ash/test/test_shelf_item_delegate.h" #include "ash/wm/window_util.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/corewm/corewm_switches.h" diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 8ce493ea127c38..845a4d0118f229 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -36,8 +36,8 @@ #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index c044ad87717a2a..3b9956e24edf92 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc @@ -36,10 +36,10 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "grit/ash_resources.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/events/event.h" diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index d5c5f904809730..3595833d73907c 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -23,8 +23,8 @@ #include "ash/wm/workspace_controller.h" #include "grit/ash_resources.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index ed613bb26840c8..042fa3a1826f0e 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc @@ -15,7 +15,7 @@ #include "ash/test/shelf_test_api.h" #include "ash/test/shelf_view_test_api.h" #include "ash/wm/window_util.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event_utils.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" diff --git a/ash/shell.cc b/ash/shell.cc index b80c60533086c7..d86056c85e7a80 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -86,8 +86,8 @@ #include "ui/aura/client/user_action_client.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 75713c361e90e2..50622f47fea9f6 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -22,8 +22,8 @@ #include "content/shell/browser/shell_net_log.h" #include "net/base/net_module.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/compositor/compositor.h" diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index 5d17d8dd486a58..2cdb4b7518ca4c 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -7,8 +7,8 @@ #include "ash/shell/example_factory.h" #include "ash/shell_window_ids.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" #include "ui/gfx/geometry/rect.h" diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc index 8776be74e258d4..0cd5a2533602ea 100644 --- a/ash/shell/panel_window.cc +++ b/ash/shell/panel_window.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ash/wm/panels/panel_frame_view.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/canvas.h" #include "ui/views/widget/widget.h" diff --git a/ash/shell/toplevel_window.cc b/ash/shell/toplevel_window.cc index 16fba7942677db..2f620c19581b2c 100644 --- a/ash/shell/toplevel_window.cc +++ b/ash/shell/toplevel_window.cc @@ -9,8 +9,8 @@ #include "ash/wm/window_positioner.h" #include "ash/wm/window_state.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/canvas.h" #include "ui/views/widget/widget.h" diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc index 0f98b783811f04..7a71eb8d0bec76 100644 --- a/ash/shell/widgets.cc +++ b/ash/shell/widgets.cc @@ -4,8 +4,8 @@ #include "ash/shell.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/label_button.h" diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 7abdcb4514bb98..fad37b97051dea 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -20,8 +20,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "content/public/browser/browser_thread.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" #include "ui/message_center/message_center.h" diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index c2244e20d9d041..075d4a3cc369c0 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -13,8 +13,8 @@ #include "ash/shell.h" #include "ash/shell/window_watcher_shelf_item_delegate.h" #include "ash/shell_window_ids.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" namespace ash { diff --git a/ash/shell/window_watcher_unittest.cc b/ash/shell/window_watcher_unittest.cc index 285c3137edc71c..25a26ec63cf3d3 100644 --- a/ash/shell/window_watcher_unittest.cc +++ b/ash/shell/window_watcher_unittest.cc @@ -9,7 +9,7 @@ #include "ash/shell/shell_delegate_impl.h" #include "ash/system/user/login_status.h" #include "ash/test/ash_test_base.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" namespace ash { diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 203a38b0101b07..f13cbf66ccbe34 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -25,10 +25,10 @@ #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_handler.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/models/simple_menu_model.h" #include "ui/events/test/events_test_utils.h" #include "ui/gfx/size.h" diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc index fe380c43f293aa..ca7f6ee6c1a545 100644 --- a/ash/sticky_keys/sticky_keys_controller.cc +++ b/ash/sticky_keys/sticky_keys_controller.cc @@ -13,8 +13,8 @@ #include "ash/sticky_keys/sticky_keys_overlay.h" #include "base/basictypes.h" #include "base/debug/stack_trace.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/events/event.h" #include "ui/events/keycodes/keyboard_code_conversion.h" diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc index a5aecb41812c54..55a6ed183a01c3 100644 --- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc +++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc @@ -8,7 +8,7 @@ #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/test/ash_test_base.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host_delegate.h" #include "ui/events/event.h" diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc index c518ea96e3607a..0b3202cdb32a75 100644 --- a/ash/sticky_keys/sticky_keys_unittest.cc +++ b/ash/sticky_keys/sticky_keys_unittest.cc @@ -14,8 +14,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/memory/scoped_vector.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host_delegate.h" #include "ui/events/event_handler.h" #include "ui/events/test/events_test_utils_x11.h" diff --git a/ash/system/logout_button/logout_confirmation_dialog_view.cc b/ash/system/logout_button/logout_confirmation_dialog_view.cc index b26d42fc8db13b..3e65dbf073a8ca 100644 --- a/ash/system/logout_button/logout_confirmation_dialog_view.cc +++ b/ash/system/logout_button/logout_confirmation_dialog_view.cc @@ -10,7 +10,7 @@ #include "ash/system/tray/tray_constants.h" #include "base/location.h" #include "grit/ash_strings.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/time_format.h" #include "ui/base/ui_base_types.h" diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc index c1c62f39084fbd..72a289db50e470 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc @@ -11,7 +11,7 @@ #include "ash/shell_window_ids.h" #include "ash/system/tray/tray_constants.h" #include "base/strings/utf_string_conversions.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 7b34deea01d994..59f69707885d7e 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -34,7 +34,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/timer/timer.h" #include "grit/ash_strings.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/events/event_constants.h" diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 1515e4d2ac98b0..db60ad6c247a4f 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -18,8 +18,8 @@ #include "ash/system/tray/tray_event_filter.h" #include "ash/wm/window_animations.h" #include "grit/ash_resources.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ash/system/tray/tray_bubble_wrapper.cc b/ash/system/tray/tray_bubble_wrapper.cc index 2bcb07bb3de238..5bd0c96e955bd4 100644 --- a/ash/system/tray/tray_bubble_wrapper.cc +++ b/ash/system/tray/tray_bubble_wrapper.cc @@ -8,8 +8,8 @@ #include "ash/system/tray/tray_event_filter.h" #include "ash/wm/window_properties.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/bubble/tray_bubble_view.h" #include "ui/views/widget/widget.h" diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc index 676c8b6346c039..d15c83dea7bf87 100644 --- a/ash/system/tray/tray_event_filter.cc +++ b/ash/system/tray/tray_event_filter.cc @@ -13,8 +13,8 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_event_filter.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 52f47d5c7d9569..e8218610bdf0db 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -23,8 +23,8 @@ #include "base/strings/utf_string_conversions.h" #include "grit/ash_strings.h" #include "grit/ui_strings.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" #include "ui/message_center/message_center_style.h" diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 1edd14ecc2a9de..78127300e24170 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -23,11 +23,11 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/events/gestures/gesture_configuration.h" #include "ui/gfx/display.h" diff --git a/ash/test/ash_test_helper_unittest.cc b/ash/test/ash_test_helper_unittest.cc index 0de950f43c69e2..52e73fb9a79687 100644 --- a/ash/test/ash_test_helper_unittest.cc +++ b/ash/test/ash_test_helper_unittest.cc @@ -5,7 +5,7 @@ #include "ash/test/ash_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/widget.h" // Tests for AshTestHelper. Who will watch the watchers? And who will test diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc index 3b83136aa98220..764f8a166d06f7 100644 --- a/ash/test/display_manager_test_api.cc +++ b/ash/test/display_manager_test_api.cc @@ -10,7 +10,7 @@ #include "ash/display/display_manager.h" #include "ash/shell.h" #include "base/strings/string_split.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" namespace ash { diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index ef39464ca9d4e1..0a31af50374033 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.cc @@ -9,8 +9,8 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/ui_controls_factory_aura.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/base/test/ui_controls.h" #include "ui/base/test/ui_controls_aura.h" diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 25873da5f7a3aa..64e69dd031c863 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -7,9 +7,9 @@ #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/tooltip_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/point.h" diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc index 4d362c49eb98d7..d2bee6d2bd06a1 100644 --- a/ash/touch/touch_hud_debug.cc +++ b/ash/touch/touch_hud_debug.cc @@ -12,7 +12,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkPath.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/canvas.h" diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index ff66e2c8cc763a..8efc887d6d7b4c 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -8,7 +8,7 @@ #include "ash/root_window_settings.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index 38ee45cad29827..d36ecf78c3fb5a 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -9,8 +9,8 @@ #include "base/metrics/histogram.h" #include "base/strings/stringprintf.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 94363f8114d232..e4cd957c39258a 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -18,8 +18,8 @@ #include "ui/app_list/pagination_model.h" #include "ui/app_list/views/app_list_view.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/events/event.h" diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc index 0100105c90e9df..f3551f29ced412 100644 --- a/ash/wm/ash_native_cursor_manager.cc +++ b/ash/wm/ash_native_cursor_manager.cc @@ -10,7 +10,7 @@ #include "ash/wm/image_cursors.h" #include "base/logging.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor.h" namespace ash { diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc index 19e3bc4e04b24e..1b24daf34eeae8 100644 --- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc +++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc @@ -9,8 +9,8 @@ #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" #include "base/run_loop.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/test/ui_controls.h" #if defined(USE_X11) diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc index 6ca1bf2b3ecbe0..462b647bd52942 100644 --- a/ash/wm/ash_native_cursor_manager_unittest.cc +++ b/ash/wm/ash_native_cursor_manager_unittest.cc @@ -8,10 +8,10 @@ #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/wm/image_cursors.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" #if defined(OS_WIN) diff --git a/ash/wm/boot_splash_screen_chromeos.cc b/ash/wm/boot_splash_screen_chromeos.cc index 374b1b6ac8e224..4a48052c841d38 100644 --- a/ash/wm/boot_splash_screen_chromeos.cc +++ b/ash/wm/boot_splash_screen_chromeos.cc @@ -5,8 +5,8 @@ #include "ash/wm/boot_splash_screen_chromeos.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/x/x11_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_type.h" diff --git a/ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc index 589123125e9ca3..7a8ad2dcc91925 100644 --- a/ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc +++ b/ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc @@ -9,7 +9,7 @@ #include "ash/wm/caption_buttons/frame_caption_button.h" #include "base/command_line.h" #include "grit/ash_resources.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/border.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc index 3886416c6d2a04..98d9c21e020121 100644 --- a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc +++ b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc @@ -14,9 +14,9 @@ #include "ash/wm/workspace/snap_sizer.h" #include "base/command_line.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event_utils.h" #include "ui/events/gestures/gesture_configuration.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 752fd937a590d7..737f801cdff1e0 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -29,9 +29,9 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index 454d4642570f4e..3b2f8d05a805f7 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc @@ -27,9 +27,9 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/dock/docked_window_resizer.cc b/ash/wm/dock/docked_window_resizer.cc index 91bb2da937d87f..7d832e9de3bc90 100644 --- a/ash/wm/dock/docked_window_resizer.cc +++ b/ash/wm/dock/docked_window_resizer.cc @@ -23,9 +23,9 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index d51c56a8791a48..ddcb122ba3c08b 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -28,9 +28,9 @@ #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/views/corewm/window_util.h" diff --git a/ash/wm/drag_window_controller.cc b/ash/wm/drag_window_controller.cc index 937af3b0abf443..5b127b263d6e84 100644 --- a/ash/wm/drag_window_controller.cc +++ b/ash/wm/drag_window_controller.cc @@ -7,8 +7,8 @@ #include "ash/shell_window_ids.h" #include "ash/wm/window_util.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/corewm/shadow_types.h" diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 263f3992bd67d0..b5455e7e8d3c07 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -17,9 +17,9 @@ #include "base/memory/weak_ptr.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index 2b92beda1f9eb1..76f633c45dedba 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -16,8 +16,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/insets.h" diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc index 6501289b8ed814..54e819777c1006 100644 --- a/ash/wm/gestures/long_press_affordance_handler.cc +++ b/ash/wm/gestures/long_press_affordance_handler.cc @@ -14,8 +14,8 @@ #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/events/gestures/gesture_configuration.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc index e3eddbd2539951..8406586264b3be 100644 --- a/ash/wm/gestures/overview_gesture_handler_unittest.cc +++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc @@ -6,11 +6,11 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/overview/window_selector_controller.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace ash { namespace internal { diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc index 923ad0d6edb144..e674c03dd55cf0 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -17,8 +17,8 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/display.h" #include "ui/gfx/point.h" diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index ef0a6059c97aab..52342007961599 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -13,11 +13,11 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_handler.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event_utils.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index 768bffb9493486..0d5b19f8c55232 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc @@ -17,7 +17,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/timer/timer.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/corewm/compound_event_filter.h" diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index 55c8020224285a..871682d3a221de 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc @@ -16,9 +16,9 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index a9646a7ad6d3fe..3049517a84b769 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc @@ -15,7 +15,7 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_handler.h" diff --git a/ash/wm/overview/scoped_window_copy.cc b/ash/wm/overview/scoped_window_copy.cc index 59acf73524d01a..e4ef26604cfea6 100644 --- a/ash/wm/overview/scoped_window_copy.cc +++ b/ash/wm/overview/scoped_window_copy.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/gfx/display.h" #include "ui/views/corewm/shadow_types.h" diff --git a/ash/wm/overview/window_overview.cc b/ash/wm/overview/window_overview.cc index 8b1408fdfa4f12..89ef556da710b9 100644 --- a/ash/wm/overview/window_overview.cc +++ b/ash/wm/overview/window_overview.cc @@ -17,8 +17,8 @@ #include "base/metrics/histogram.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/events/event.h" #include "ui/views/background.h" diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index 5cdc61ab468365..381df78bf4fd9f 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -22,8 +22,8 @@ #include "base/timer/timer.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/events/event.h" #include "ui/events/event_handler.h" diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index c23fedc189d4d2..0bdeb825fe57c3 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -27,11 +27,11 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/transform.h" diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index cc521f4331002e..f4b0bde1ba633e 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -26,8 +26,8 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index 54860ac03404a6..aabec582865ce4 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -30,10 +30,10 @@ #include "base/i18n/rtl.h" #include "base/run_loop.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/corewm/corewm_switches.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc index b1db4a543baac7..c3d2885abc37d9 100644 --- a/ash/wm/panels/panel_window_resizer.cc +++ b/ash/wm/panels/panel_window_resizer.cc @@ -19,9 +19,9 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 5939e6ce6286b6..213708d1728385 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -22,7 +22,7 @@ #include "ash/wm/window_state.h" #include "base/win/windows_version.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_types.h" diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index b71c7c8a816347..30b12f1df06f1d 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -12,7 +12,7 @@ #include "ash/shell_window_ids.h" #include "ash/wm/overlay_event_filter.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/partial_screenshot_view_unittest.cc b/ash/wm/partial_screenshot_view_unittest.cc index 3605e807f81f29..d9083311817ca9 100644 --- a/ash/wm/partial_screenshot_view_unittest.cc +++ b/ash/wm/partial_screenshot_view_unittest.cc @@ -9,8 +9,8 @@ #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_screenshot_delegate.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" namespace ash { diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index c2e3789f1f07a7..3df7e6893d9bc3 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc @@ -11,7 +11,7 @@ #include "ash/wm/lock_state_controller.h" #include "ash/wm/session_state_animator.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/corewm/compound_event_filter.h" namespace ash { diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc index f60a0308f873c1..804bb3b074c208 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc @@ -11,8 +11,8 @@ #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/window_state.h" #include "base/bind.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc index ef1689e38f6543..b84c07a8b6e159 100644 --- a/ash/wm/root_window_layout_manager.cc +++ b/ash/wm/root_window_layout_manager.cc @@ -6,7 +6,7 @@ #include "ash/desktop_background/desktop_background_widget_controller.h" #include "ash/root_window_controller.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc index b12566e7575d36..4b4335e2ae1486 100644 --- a/ash/wm/screen_dimmer.cc +++ b/ash/wm/screen_dimmer.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "base/time/time.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/rect.h" diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index b386b01f6a05ce..2925cd4c1b740b 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -9,7 +9,7 @@ #include "ash/test/ash_test_base.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" namespace ash { diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc index de8cd42d4daf20..586539c555c87c 100644 --- a/ash/wm/session_state_animator.cc +++ b/ash/wm/session_state_animator.cc @@ -8,7 +8,7 @@ #include "ash/shell_window_ids.h" #include "ash/wm/window_animations.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/solo_window_tracker_unittest.cc b/ash/wm/solo_window_tracker_unittest.cc index 25a8d214086178..08ac7eed250e53 100644 --- a/ash/wm/solo_window_tracker_unittest.cc +++ b/ash/wm/solo_window_tracker_unittest.cc @@ -15,9 +15,9 @@ #include "ash/wm/window_state.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/hit_test.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index 6603181b79dc9f..3a79c88a9c9cc8 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -12,8 +12,8 @@ #include "ash/wm/coordinate_conversion.h" #include "ash/wm/window_state.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/views/corewm/window_util.h" diff --git a/ash/wm/stacking_controller_unittest.cc b/ash/wm/stacking_controller_unittest.cc index 9ff24697383f21..469922fdd05687 100644 --- a/ash/wm/stacking_controller_unittest.cc +++ b/ash/wm/stacking_controller_unittest.cc @@ -8,8 +8,8 @@ #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/corewm/window_util.h" using aura::Window; diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index d23325d6568418..851b453f928918 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -17,7 +17,7 @@ #include "ash/wm/gestures/system_pinch_handler.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 03f0adad795ddb..849a0e1e4f41a3 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -23,11 +23,11 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_handler.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_switches.h" #include "ui/events/event.h" diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index eaf3cdf083502a..3e0960d24b87e2 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -13,8 +13,8 @@ #include "base/bind.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index e66678a583085b..2d228dffdb1de6 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -12,9 +12,9 @@ #include "ash/wm/window_util.h" #include "base/compiler_specific.h" #include "base/run_loop.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/gfx/screen.h" #include "ui/views/corewm/window_util.h" diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index 1dbb6b4d66689b..ef3c58d69cb598 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc @@ -15,9 +15,9 @@ #include "base/run_loop.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index 2a1ce8c49a2b5a..2035355870441e 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -20,10 +20,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_move_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index d24a0d9fed9082..d0be623b2033e4 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc @@ -8,8 +8,8 @@ #include "ash/shell_window_ids.h" #include "ash/wm/window_state.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/rect.h" #include "ui/views/corewm/window_util.h" diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc index 287223d1058671..571e1ac401affd 100644 --- a/ash/wm/video_detector_unittest.cc +++ b/ash/wm/video_detector_unittest.cc @@ -12,9 +12,9 @@ #include "base/time/time.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/rect.h" #include "ui/wm/public/window_types.h" diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc index 703080ff37b327..5f7613333669db 100644 --- a/ash/wm/window_cycle_controller.cc +++ b/ash/wm/window_cycle_controller.cc @@ -13,7 +13,7 @@ #include "ash/wm/window_cycle_list.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_handler.h" diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index 67df90ef2f6e24..902853aa8dfafb 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -18,9 +18,9 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index bc8faeb050ff41..233837817acd84 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -13,12 +13,12 @@ #include "ui/aura/client/cursor_client_observer.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_event_handler.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc index 388a7cdeae882e..1e267bcc897f59 100644 --- a/ash/wm/window_modality_controller_unittest.cc +++ b/ash/wm/window_modality_controller_unittest.cc @@ -8,11 +8,11 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/views/corewm/window_util.h" #include "ui/views/test/capture_tracking_view.h" diff --git a/ash/wm/window_positioner.cc b/ash/wm/window_positioner.cc index 51f92a4f6688a0..0c4827b6c8f7d3 100644 --- a/ash/wm/window_positioner.cc +++ b/ash/wm/window_positioner.cc @@ -13,9 +13,9 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc index 72ae6302eb48d6..49c74b4f99986e 100644 --- a/ash/wm/window_positioner_unittest.cc +++ b/ash/wm/window_positioner_unittest.cc @@ -9,7 +9,7 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_state.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 5569646fb1f9bf..14c1fd9ea1f612 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -12,9 +12,9 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index dc71c58fc2c973..14193c3083ad09 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -13,8 +13,8 @@ #include "ash/wm/window_state.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index 177950eaf964ae..edae6de385fe82 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc @@ -13,9 +13,9 @@ #include "ash/wm/workspace/workspace_window_resizer.h" #include "grit/ash_resources.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc index cb12e9c281d02b..f56575b518db63 100644 --- a/ash/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc @@ -12,8 +12,8 @@ #include "ash/wm/coordinate_conversion.h" #include "grit/ash_resources.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" diff --git a/ash/wm/workspace/phantom_window_controller_unittest.cc b/ash/wm/workspace/phantom_window_controller_unittest.cc index ecd8c6d0484796..760db96f05132c 100644 --- a/ash/wm/workspace/phantom_window_controller_unittest.cc +++ b/ash/wm/workspace/phantom_window_controller_unittest.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/workspace/snap_sizer_unittest.cc b/ash/wm/workspace/snap_sizer_unittest.cc index a75185fc7639a0..92241b1d146349 100644 --- a/ash/wm/workspace/snap_sizer_unittest.cc +++ b/ash/wm/workspace/snap_sizer_unittest.cc @@ -11,9 +11,9 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index 914af8df10c4d0..52fdb4340a2b9c 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -14,10 +14,10 @@ #include "ash/wm/workspace_controller_test_helper.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_move_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/gfx/screen.h" #include "ui/views/corewm/window_util.h" diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 3f4bedb77ca6fc..c88909bc60cce7 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -20,9 +20,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index c5d62c343a6a7f..4f757ebe845679 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -30,9 +30,9 @@ #include "base/memory/weak_ptr.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index 017c4c19ba18bd..bfab221a6e53c3 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -22,9 +22,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/events/gestures/gesture_configuration.h" #include "ui/gfx/insets.h" diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index d869d135971a20..55ccf64fd6b6e7 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -15,8 +15,8 @@ #include "ash/wm/workspace/workspace_layout_manager.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/views/corewm/visibility_controller.h" diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index aef7453e64e29e..c88dd1f4fdf046 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -23,11 +23,11 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer.h" diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc index 7ba678d366d661..6b79fae4fb0c00 100644 --- a/chrome/browser/chrome_plugin_browsertest.cc +++ b/chrome/browser/chrome_plugin_browsertest.cc @@ -35,8 +35,8 @@ #if defined(OS_WIN) #include "content/public/browser/web_contents_view.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::BrowserThread; diff --git a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc index cb93170801cfd3..a1c3e1fb7503f5 100644 --- a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc @@ -14,7 +14,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc index 612ac267d4efd6..a34f90fcde1c50 100644 --- a/chrome/browser/chromeos/events/event_rewriter.cc +++ b/chrome/browser/chromeos/events/event_rewriter.cc @@ -31,7 +31,7 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/x/x11_util.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 0ba13b70051271..930040597714cc 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc @@ -14,9 +14,9 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" #include "chrome/common/chrome_switches.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" //#include "base/compiler_specific.h" //#include "base/logging.h" diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc index b32a8a89a0c2c2..b9f58b5a0f5be8 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine.cc @@ -27,8 +27,8 @@ #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/ibus_keymap.h" #include "chromeos/ime/input_method_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/candidate_window.h" #include "ui/events/event.h" #include "ui/events/keycodes/dom4/keycode_converter.h" diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.cc b/chrome/browser/chromeos/input_method/textinput_test_helper.cc index d28fa675472e41..1c2c3f8f31c5b2 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.cc +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method_factory.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/lock_window_aura.cc b/chrome/browser/chromeos/login/lock_window_aura.cc index 02e69899ae0e52..01bf843ad05d25 100644 --- a/chrome/browser/chromeos/login/lock_window_aura.cc +++ b/chrome/browser/chromeos/login/lock_window_aura.cc @@ -8,8 +8,8 @@ #include "ash/shell_window_ids.h" #include "ash/wm/window_animations.h" #include "base/command_line.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc index d7528e664151ca..3a7274aeb89265 100644 --- a/chrome/browser/chromeos/login/webui_screen_locker.cc +++ b/chrome/browser/chromeos/login/webui_screen_locker.cc @@ -28,7 +28,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_ui.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/screen.h" diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index e6a092a65de5ad..aad98cf2b277c1 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -26,7 +26,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc index 03b656eb3086ef..d75a13060395dd 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "grit/generated_resources.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc index 65dc328915ef7e..e841d001c337f5 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc @@ -15,7 +15,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" #include "grit/generated_resources.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" diff --git a/chrome/browser/download/drag_download_item_views.cc b/chrome/browser/download/drag_download_item_views.cc index 72d6390e9ecab7..d334d409405e3e 100644 --- a/chrome/browser/download/drag_download_item_views.cc +++ b/chrome/browser/download/drag_download_item_views.cc @@ -21,8 +21,8 @@ #if defined(USE_AURA) #include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc index 0ff1d3f5cf7589..658e085ca84406 100644 --- a/chrome/browser/extensions/api/app_window/app_window_api.cc +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc @@ -35,8 +35,8 @@ #if defined(USE_ASH) #include "ash/shell.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using apps::AppWindow; diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index f3e16e926c0d91..7cb35c7aca5510 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -15,8 +15,8 @@ #include "net/dns/mock_host_resolver.h" #if defined(OS_WIN) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif // Window resizes are not completed by the time the callback happens, diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index ec59a360e49004..7cc74aba6cb30a 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -32,8 +32,8 @@ #include "ui/views/widget/widget.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace { diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc index 15d1867a3e1b91..deace263022a88 100644 --- a/chrome/browser/lifetime/application_lifetime_aura.cc +++ b/chrome/browser/lifetime/application_lifetime_aura.cc @@ -8,7 +8,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/common/chrome_switches.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/widget.h" #if defined(USE_ASH) diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index b5fc75e19aded8..742cdcc5511f0a 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -22,7 +22,7 @@ #include "ash/shell.h" #include "ash/test/test_shell_delegate.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/test/context_factories_for_test.h" #endif diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc index 21e7caaf9f7eef..525fb7c815b50c 100644 --- a/chrome/browser/notifications/fullscreen_notification_blocker.cc +++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc @@ -14,8 +14,8 @@ #include "ash/shell.h" #include "ash/system/system_notifier.h" #include "ash/wm/window_state.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace { diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc index afc7bc8074de0d..79b3617ac37b9f 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos.cc @@ -10,8 +10,8 @@ #include "ash/wm/window_properties.h" #include "chrome/browser/chrome_notification_types.h" #include "content/public/browser/notification_service.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/message_center/message_center.h" LoginStateNotificationBlockerChromeOS::LoginStateNotificationBlockerChromeOS( diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc index b89df1051b2578..73f54cd453ba96 100644 --- a/chrome/browser/password_manager/password_manager_util_win.cc +++ b/chrome/browser/password_manager/password_manager_util_win.cc @@ -29,8 +29,8 @@ #include "ui/base/l10n/l10n_util.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif // static diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index c15c2a6e9dee78..960d99ff7fa186 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -41,8 +41,8 @@ #include "webkit/common/webpreferences.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif #if defined(OS_WIN) diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc index db47ce3bacd430..ddf8f622e10eb5 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc @@ -24,8 +24,8 @@ #include "ppapi/proxy/ppapi_messages.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::BrowserPpapiHost; diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc index 91e35b78bfba4d..68fabac6dea8a6 100644 --- a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc +++ b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc @@ -11,8 +11,8 @@ #include "ui/gfx/text_elider.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::JavaScriptDialogManager; diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc index 4ba14256fe5c0b..cc1bbccc27a3d9 100644 --- a/chrome/browser/ui/ash/ash_init.cc +++ b/chrome/browser/ui/ash/ash_init.cc @@ -19,7 +19,7 @@ #include "chrome/browser/ui/ash/screenshot_taker.h" #include "chrome/common/chrome_switches.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #if defined(OS_CHROMEOS) #include "base/sys_info.h" diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc index a0a2853fcb18c1..a36bd863ed6367 100644 --- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc +++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc @@ -24,8 +24,8 @@ #include "extensions/common/constants.h" #include "ipc/ipc_message_macros.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/text_input_client.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc index 8d51b019d1d984..0b3bdcc0805b17 100644 --- a/chrome/browser/ui/ash/ash_util.cc +++ b/chrome/browser/ui/ash/ash_util.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "chrome/browser/ui/ash/ash_init.h" #include "chrome/browser/ui/host_desktop.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" namespace chrome { diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc index 6b6fc1c801c159..e323e45f935b4e 100644 --- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "extensions/common/extension.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" using apps::AppWindow; diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc index 030c286f6b08d4..ad340953805977 100644 --- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc +++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc @@ -18,8 +18,8 @@ #include "chrome/browser/web_applications/web_app.h" #include "content/public/browser/web_contents.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" BrowserStatusMonitor::LocalWebContentsObserver::LocalWebContentsObserver( diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index d16e333e8536e2..6a5685baeec4e5 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -81,8 +81,8 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "net/base/url_util.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/corewm/window_animations.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc index 35e5404c9cc8bb..6c885e0e783881 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/test/base/testing_profile.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" class TestChromeLauncherController : public ChromeLauncherController { public: diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc index 80e74bf02e8b7d..3a285ef65e6b11 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc @@ -39,8 +39,8 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/events/event.h" #include "ui/message_center/message_center.h" diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index 74fffe98f375e7..11574ad04b5971 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc @@ -19,7 +19,7 @@ #include "chrome/test/base/testing_profile.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/views/corewm/window_util.h" diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index fecec918ba1410..e0fecd4401e6d4 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -31,8 +31,8 @@ #include "grit/ash_strings.h" #include "grit/theme_resources.h" #include "grit/ui_strings.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/ash/screenshot_taker_unittest.cc b/chrome/browser/ui/ash/screenshot_taker_unittest.cc index 1d33036956bad3..1cb3d7652722c8 100644 --- a/chrome/browser/ui/ash/screenshot_taker_unittest.cc +++ b/chrome/browser/ui/ash/screenshot_taker_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/test_utils.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/message_center/message_center_switches.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc index cc5fc1c481e169..d57ebb8624bd31 100644 --- a/chrome/browser/ui/ash/window_positioner_unittest.cc +++ b/chrome/browser/ui/ash/window_positioner_unittest.cc @@ -17,8 +17,8 @@ #include "content/public/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/chrome/browser/ui/aura/active_desktop_monitor.cc b/chrome/browser/ui/aura/active_desktop_monitor.cc index 67fba149d81f0d..2ad7061b0fd91e 100644 --- a/chrome/browser/ui/aura/active_desktop_monitor.cc +++ b/chrome/browser/ui/aura/active_desktop_monitor.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/aura/active_desktop_monitor.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #if defined(USE_X11) #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 3b463b4d9f0769..756e7f2c0ba448 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -44,8 +44,8 @@ #if defined(OS_WIN) #include "content/public/browser/web_contents_view.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using base::ASCIIToUTF16; diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc index 792d538a54f58b..6654a5c1a283b1 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h" #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h" #include "grit/ui_strings.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/l10n/l10n_util.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc index 5546b6ba378bd5..cb3ac826dd14ee 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc @@ -20,7 +20,7 @@ #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" // These conflict with base/tracked_objects.h, so need to come last. diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc index 6741b81927c15a..b23e67cc655e57 100644 --- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc @@ -32,8 +32,8 @@ #endif #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/test/context_factories_for_test.h" #endif diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc index e476d69f8235ea..b445d0b10659d2 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc +++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc @@ -68,8 +68,8 @@ #include "win8/util/win8_util.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif #if defined(USE_ASH) diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc index 59fc29ce84257c..fdb3c1fdea26f9 100644 --- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc +++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" #include "chrome/browser/ui/views/apps/native_app_window_views.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/controls/webview/webview.h" #include "ui/wm/public/easy_resize_window_targeter.h" diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc index 65ad0eea247c8a..1946bd59df0374 100644 --- a/chrome/browser/ui/views/certificate_viewer_win.cc +++ b/chrome/browser/ui/views/certificate_viewer_win.cc @@ -14,8 +14,8 @@ #if defined(USE_AURA) #include "chrome/browser/ui/host_desktop.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace { diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 213e3b2c2edf69..70c4236fde5475 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -30,7 +30,7 @@ #endif #if defined(USE_AURA) -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #endif #if defined(USE_AURA) && !defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc index 951a27de4b33ba..d8c1adb544a701 100644 --- a/chrome/browser/ui/views/desktop_media_picker_views.cc +++ b/chrome/browser/ui/views/desktop_media_picker_views.cc @@ -26,7 +26,7 @@ #include "ui/views/window/dialog_delegate.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::DesktopMediaID; diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc index d6b554e6197327..2a236b56e81ae5 100644 --- a/chrome/browser/ui/views/first_run_dialog.cc +++ b/chrome/browser/ui/views/first_run_dialog.cc @@ -17,7 +17,7 @@ #include "grit/theme_resources.h" #include "ui/aura/client/dispatcher_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/link.h" diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index dbee5f5b5cb0f9..535f6fb09ce575 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc @@ -25,8 +25,8 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/theme_provider.h" #include "ui/gfx/font_list.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index eaef4edd0f5699..9998dc509832d9 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -144,8 +144,8 @@ #endif #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" #endif diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc index 9374e1d3832b6d..e632526b4c30e8 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc @@ -12,8 +12,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc index 10bf10e8857e7a..8f1c598ca670e1 100644 --- a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc @@ -21,8 +21,8 @@ #if defined(OS_WIN) #include "content/public/browser/web_contents_view.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace { diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 45a75f03534768..f152aca7f62ece 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -57,7 +57,7 @@ #if defined(USE_AURA) #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #endif diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc index 71333b63ab906b..14ee42b7d09433 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc @@ -19,9 +19,9 @@ #include "ui/base/test/ui_controls.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host_delegate.h" #endif // defined(USE_AURA) diff --git a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc index 652295b15bd82f..12371bc8a63c47 100644 --- a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc +++ b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/chrome_views_export.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 146924bbe072fb..8deeebc76fac75 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -15,7 +15,7 @@ #include "grit/generated_resources.h" #include "ui/aura/client/dispatcher_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/message_box_view.h" diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index fc950d2f764bef..741a77fa863874 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -48,8 +48,8 @@ #include "ash/wm/coordinate_conversion.h" #include "ash/wm/window_state.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/gestures/gesture_recognizer.h" #endif diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 201661c1de1e2e..18b043bebc78f2 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc @@ -52,8 +52,8 @@ #include "ash/wm/window_util.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::WebContents; diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc index f8f054e6242e5d..78499a7fd977e5 100644 --- a/chrome/browser/ui/views/tabs/window_finder_ash.cc +++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc @@ -6,8 +6,8 @@ #include "ash/shell_window_ids.h" #include "ash/wm/coordinate_conversion.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace { diff --git a/chrome/browser/ui/views/tabs/window_finder_x11.cc b/chrome/browser/ui/views/tabs/window_finder_x11.cc index 09c3e295107d28..65b15ac20cfbbc 100644 --- a/chrome/browser/ui/views/tabs/window_finder_x11.cc +++ b/chrome/browser/ui/views/tabs/window_finder_x11.cc @@ -6,8 +6,8 @@ #include "base/debug/trace_event.h" #include "chrome/browser/ui/host_desktop.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/x/x11_util.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc index d7af46672d7878..11621a2f6445c5 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc @@ -24,8 +24,8 @@ #if defined(OS_WIN) #include "content/public/browser/web_contents_view.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace { diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc index 3ad703f2f392b2..1349c0b7e5d673 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc @@ -9,8 +9,8 @@ #include "ash/wm/window_state.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" void WindowSizer::GetTabbedBrowserBoundsAsh( diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc index e54abdd3a05e58..6f7ef27202810a 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc @@ -13,8 +13,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/test/base/in_process_browser_test.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/test/ui_controls.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index 78582594e8114e..8150107c7ae34f 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc @@ -21,8 +21,8 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_windows.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/screen.h" typedef ash::test::AshTestBase WindowSizerAshTest; diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc index 1dfe006ff5e06a..bf680115de9659 100644 --- a/chrome/test/base/chrome_render_view_host_test_harness.cc +++ b/chrome/test/base/chrome_render_view_host_test_harness.cc @@ -15,7 +15,7 @@ #if defined(USE_AURA) #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::RenderViewHostTester; diff --git a/chrome/test/base/interactive_test_utils_win.cc b/chrome/test/base/interactive_test_utils_win.cc index ba8343ead920a0..6ee8640a16934b 100644 --- a/chrome/test/base/interactive_test_utils_win.cc +++ b/chrome/test/base/interactive_test_utils_win.cc @@ -16,7 +16,7 @@ #if defined(USE_AURA) #include "chrome/browser/ui/host_desktop.h" #include "chrome/test/base/interactive_test_utils_aura.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace ui_test_utils { diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 4a59ddcaa7b8ee..02cab8445a3740 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -79,7 +79,7 @@ #if defined(USE_AURA) #include "ash/shell.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using content::DomOperationNotificationDetails; diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 2e116f3155f8b2..917e335532603c 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -28,8 +28,8 @@ #if defined(USE_AURA) #include "ui/aura/client/event_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/views/corewm/wm_state.h" diff --git a/content/browser/renderer_host/compositor_resize_lock_aura.cc b/content/browser/renderer_host/compositor_resize_lock_aura.cc index 33d8d5bf68fab0..0f0b53c4c6173a 100644 --- a/content/browser/renderer_host/compositor_resize_lock_aura.cc +++ b/content/browser/renderer_host/compositor_resize_lock_aura.cc @@ -6,7 +6,7 @@ #include "base/debug/trace_event.h" #include "content/public/browser/browser_thread.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/compositor.h" namespace content { diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc index e4b75853a1dce9..1b76ea2e6e4f07 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc @@ -8,8 +8,8 @@ #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "content/browser/renderer_host/ui_events_helper.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/gestures/gesture_configuration.h" using blink::WebTouchEvent; diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura.cc b/content/browser/renderer_host/media/desktop_capture_device_aura.cc index 840b31e3427699..172088c3153d04 100644 --- a/content/browser/renderer_host/media/desktop_capture_device_aura.cc +++ b/content/browser/renderer_host/media/desktop_capture_device_aura.cc @@ -17,8 +17,8 @@ #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/cursor/cursors_aura.h" #include "ui/compositor/compositor.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 1399a20c06f23b..2f44972f014ce7 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -58,8 +58,8 @@ #include "ui/aura/client/transient_window_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tracker.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index b048351ad9da40..0a5f330694d6df 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc @@ -32,13 +32,13 @@ #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_cursor_client.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/compositor.h" diff --git a/content/browser/web_contents/aura/window_slider_unittest.cc b/content/browser/web_contents/aura/window_slider_unittest.cc index 47887bd75dff82..ba5691b4b8c2f0 100644 --- a/content/browser/web_contents/aura/window_slider_unittest.cc +++ b/content/browser/web_contents/aura/window_slider_unittest.cc @@ -6,11 +6,11 @@ #include "base/bind.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" namespace content { diff --git a/content/browser/web_contents/touch_editable_impl_aura.cc b/content/browser/web_contents/touch_editable_impl_aura.cc index be45d18c945b1f..3f3ff90a7adaaf 100644 --- a/content/browser/web_contents/touch_editable_impl_aura.cc +++ b/content/browser/web_contents/touch_editable_impl_aura.cc @@ -11,8 +11,8 @@ #include "grit/ui_strings.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/ui_base_switches_util.h" #include "ui/gfx/range/range.h" diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc index 2b1a5cbb1a53ca..d46c5fc7e65f87 100644 --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc @@ -19,9 +19,9 @@ #include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/event_utils.h" diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 44b645719f48f9..8927718edd64d5 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -47,9 +47,9 @@ #include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_observer.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/custom_data_helper.h" diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 8079c9ce71b912..e861b3deefef27 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -25,9 +25,9 @@ #include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" namespace content { diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc index 8f00da32179d42..4719a150c58632 100644 --- a/content/shell/browser/shell_aura.cc +++ b/content/shell/browser/shell_aura.cc @@ -8,9 +8,9 @@ #include "content/public/browser/web_contents_view.h" #include "content/shell/browser/shell_platform_data_aura.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace content { diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc index 566d40455f21da..572d79eaa51f79 100644 --- a/content/shell/browser/shell_download_manager_delegate.cc +++ b/content/shell/browser/shell_download_manager_delegate.cc @@ -29,8 +29,8 @@ #include "net/base/net_util.h" #if defined(OS_WIN) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace content { diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc index 3de6e502c076e4..95af492ded881a 100644 --- a/content/shell/browser/shell_platform_data_aura.cc +++ b/content/shell/browser/shell_platform_data_aura.cc @@ -10,10 +10,10 @@ #include "ui/aura/client/default_capture_client.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_focus_client.h" #include "ui/aura/test/test_window_tree_client.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_delegate.h" #include "ui/base/ime/input_method_factory.h" diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc index 5a661d6c096fdc..a3cfbd89e2ec81 100644 --- a/content/shell/browser/shell_views.cc +++ b/content/shell/browser/shell_views.cc @@ -13,8 +13,8 @@ #include "content/shell/browser/shell_platform_data_aura.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/models/simple_menu_model.h" diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index 9d1e09331ca24d..463b757100ff48 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -20,9 +20,9 @@ #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/gfx/canvas.h" diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc index 2054c302d8e297..43addf41d9903f 100644 --- a/mojo/examples/launcher/launcher.cc +++ b/mojo/examples/launcher/launcher.cc @@ -27,10 +27,10 @@ #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_focus_client.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/base/hit_test.h" #include "ui/base/ime/input_method.h" diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 43975775fba3ba..2c4b2902dabf37 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -29,8 +29,8 @@ #if defined(USE_AURA) #include "ui/aura/remote_window_tree_host_win.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif using base::Time; diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc index 21163f47c0ae3c..79a1b2911a27a3 100644 --- a/ui/app_list/views/app_list_view.cc +++ b/ui/app_list/views/app_list_view.cc @@ -34,7 +34,7 @@ #if defined(USE_AURA) #include "ui/aura/window.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #if defined(OS_WIN) #include "ui/base/win/shell.h" #endif diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 2e669b3389c017..b13cf1e28a925a 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -31,8 +31,8 @@ #include "ui/views/widget/widget.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #if defined(OS_WIN) #include "ui/views/win/hwnd_util.h" #endif // defined(OS_WIN) diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 9b37c6e77867dd..376723bf3f74b4 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -91,31 +91,31 @@ 'layout_manager.h', 'remote_window_tree_host_win.cc', 'remote_window_tree_host_win.h', - 'window_tree_host_mac.mm', - 'window_tree_host_mac.h', - 'window_tree_host_ozone.cc', - 'window_tree_host_ozone.h', - 'window_tree_host_win.cc', - 'window_tree_host_win.h', - 'window_tree_host_x11.cc', - 'window_tree_host_x11.h', 'root_window_transformer.h', - 'root_window.cc', - 'root_window.h', 'scoped_window_targeter.cc', 'scoped_window_targeter.h', 'window.cc', 'window.h', - 'window_targeter.cc', - 'window_targeter.h', + 'window_event_dispatcher.cc', + 'window_event_dispatcher.h', 'window_delegate.h', 'window_layer_type.h', 'window_observer.h', + 'window_targeter.cc', + 'window_targeter.h', 'window_tracker.cc', 'window_tracker.h', 'window_tree_host.cc', 'window_tree_host.h', 'window_tree_host_delegate.h', + 'window_tree_host_mac.mm', + 'window_tree_host_mac.h', + 'window_tree_host_ozone.cc', + 'window_tree_host_ozone.h', + 'window_tree_host_win.cc', + 'window_tree_host_win.h', + 'window_tree_host_x11.cc', + 'window_tree_host_x11.h', ], 'conditions': [ ['use_x11==1', { @@ -268,7 +268,7 @@ 'sources': [ 'gestures/gesture_recognizer_unittest.cc', 'window_tree_host_x11_unittest.cc', - 'root_window_unittest.cc', + 'window_event_dispatcher_unittest.cc', 'test/run_all_unittests.cc', 'window_targeter_unittest.cc', 'window_unittest.cc', diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index ce1d6d15ac5510..7692633e6826e4 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -16,10 +16,10 @@ #include "third_party/skia/include/core/SkXfermode.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_focus_client.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_observer.h" diff --git a/ui/aura/client/activation_client.cc b/ui/aura/client/activation_client.cc index b4633aec5abc9c..71d079be1eb522 100644 --- a/ui/aura/client/activation_client.cc +++ b/ui/aura/client/activation_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::Window*) diff --git a/ui/aura/client/animation_host.cc b/ui/aura/client/animation_host.cc index 5df22babc62524..0afe58351c4a8b 100644 --- a/ui/aura/client/animation_host.cc +++ b/ui/aura/client/animation_host.cc @@ -8,7 +8,7 @@ #include "ui/aura/aura_export.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::AnimationHost*) diff --git a/ui/aura/client/capture_client.cc b/ui/aura/client/capture_client.cc index cbcabd7393fcbb..6d78c88d15594e 100644 --- a/ui/aura/client/capture_client.cc +++ b/ui/aura/client/capture_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/capture_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::CaptureClient*) diff --git a/ui/aura/client/default_capture_client.cc b/ui/aura/client/default_capture_client.cc index df6a1b0974571a..b0a10553d9faea 100644 --- a/ui/aura/client/default_capture_client.cc +++ b/ui/aura/client/default_capture_client.cc @@ -4,8 +4,8 @@ #include "ui/aura/client/default_capture_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace aura { namespace client { diff --git a/ui/aura/client/dispatcher_client.cc b/ui/aura/client/dispatcher_client.cc index a9e1a7d4cd5e73..a2202210c80f7b 100644 --- a/ui/aura/client/dispatcher_client.cc +++ b/ui/aura/client/dispatcher_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/dispatcher_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::DispatcherClient*); diff --git a/ui/aura/client/drag_drop_client.cc b/ui/aura/client/drag_drop_client.cc index abf5879e578b15..56050e8f665886 100644 --- a/ui/aura/client/drag_drop_client.cc +++ b/ui/aura/client/drag_drop_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::DragDropClient*) diff --git a/ui/aura/client/event_client.cc b/ui/aura/client/event_client.cc index c6699741b3c1cf..d6da07e4245897 100644 --- a/ui/aura/client/event_client.cc +++ b/ui/aura/client/event_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/event_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::EventClient*) diff --git a/ui/aura/client/focus_client.cc b/ui/aura/client/focus_client.cc index 0769b0dfac01f7..1f24a802cbcb94 100644 --- a/ui/aura/client/focus_client.cc +++ b/ui/aura/client/focus_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::Window*) diff --git a/ui/aura/client/screen_position_client.cc b/ui/aura/client/screen_position_client.cc index 1fb75217bcb663..8601005e4ea944 100644 --- a/ui/aura/client/screen_position_client.cc +++ b/ui/aura/client/screen_position_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ScreenPositionClient*) diff --git a/ui/aura/client/tooltip_client.cc b/ui/aura/client/tooltip_client.cc index f018f262812563..770be410726745 100644 --- a/ui/aura/client/tooltip_client.cc +++ b/ui/aura/client/tooltip_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/tooltip_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*) diff --git a/ui/aura/client/user_action_client.cc b/ui/aura/client/user_action_client.cc index 3dab666660cff8..b8bb4870926cd6 100644 --- a/ui/aura/client/user_action_client.cc +++ b/ui/aura/client/user_action_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/user_action_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" namespace aura { diff --git a/ui/aura/client/visibility_client.cc b/ui/aura/client/visibility_client.cc index 5fc7beed7c1c11..853c034951f72e 100644 --- a/ui/aura/client/visibility_client.cc +++ b/ui/aura/client/visibility_client.cc @@ -4,7 +4,7 @@ #include "ui/aura/client/visibility_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::VisibilityClient*) diff --git a/ui/aura/client/window_tree_client.cc b/ui/aura/client/window_tree_client.cc index de1ece561d0dc5..1b263c3e756229 100644 --- a/ui/aura/client/window_tree_client.cc +++ b/ui/aura/client/window_tree_client.cc @@ -5,7 +5,7 @@ #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowTreeClient*) diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index c958aa926adc4f..6406ac51bc7a12 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -11,11 +11,11 @@ #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_focus_client.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/events/event.h" diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index d65a9513e6dff9..56e4ccc21da12f 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -9,12 +9,12 @@ #include "base/timer/timer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_switches.h" #include "ui/events/event.h" diff --git a/ui/aura/remote_window_tree_host_win.cc b/ui/aura/remote_window_tree_host_win.cc index d57fc3040e4c3b..1eae586f20b8c0 100644 --- a/ui/aura/remote_window_tree_host_win.cc +++ b/ui/aura/remote_window_tree_host_win.cc @@ -13,7 +13,7 @@ #include "ipc/ipc_sender.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/base/cursor/cursor_loader_win.h" #include "ui/base/ime/composition_text.h" diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index 84f1988c717094..b4926fbb06ffcc 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -5,10 +5,10 @@ #include "ui/aura/test/aura_test_base.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/events/event_dispatcher.h" diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index b05f21f29d73e7..70f3025c28e1fa 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -12,11 +12,11 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" #include "ui/aura/input_state_lookup.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/env_test_helper.h" #include "ui/aura/test/test_focus_client.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_tree_client.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/dummy_input_method.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/compositor/compositor.h" diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h index cbf937f0422b7a..6c014db16ef7dd 100644 --- a/ui/aura/test/aura_test_helper.h +++ b/ui/aura/test/aura_test_helper.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" namespace base { class MessageLoopForUI; diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc index 97b850953d30a0..705df126b64e9d 100644 --- a/ui/aura/test/event_generator.cc +++ b/ui/aura/test/event_generator.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop_proxy.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" diff --git a/ui/aura/test/test_screen.cc b/ui/aura/test/test_screen.cc index 7e79608af9cf7a..26a2eeb0d8adf1 100644 --- a/ui/aura/test/test_screen.cc +++ b/ui/aura/test/test_screen.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/aura/test/ui_controls_factory_aurawin.cc b/ui/aura/test/ui_controls_factory_aurawin.cc index 3c8dc4c98f9866..8cbf92741fa1bd 100644 --- a/ui/aura/test/ui_controls_factory_aurawin.cc +++ b/ui/aura/test/ui_controls_factory_aurawin.cc @@ -5,9 +5,9 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/ui_controls_factory_aura.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/test/ui_controls_aura.h" #include "ui/base/test/ui_controls_internal_win.h" diff --git a/ui/aura/test/ui_controls_factory_aurax11.cc b/ui/aura/test/ui_controls_factory_aurax11.cc index 9a78594deb9eca..452acabc4ecd2c 100644 --- a/ui/aura/test/ui_controls_factory_aurax11.cc +++ b/ui/aura/test/ui_controls_factory_aurax11.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/ui_controls_factory_aura.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/test/ui_controls_aura.h" #include "ui/base/x/x11_util.h" #include "ui/compositor/dip_util.h" diff --git a/ui/aura/window.cc b/ui/aura/window.cc index df66b704f48840..5e135e63b53169 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -22,8 +22,8 @@ #include "ui/aura/client/window_stacking_client.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tracker.h" #include "ui/aura/window_tree_host.h" diff --git a/ui/aura/root_window.cc b/ui/aura/window_event_dispatcher.cc similarity index 99% rename from ui/aura/root_window.cc rename to ui/aura/window_event_dispatcher.cc index 35349ee5c7b953..fce9acc1bdb88e 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/window_event_dispatcher.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 "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include diff --git a/ui/aura/root_window.h b/ui/aura/window_event_dispatcher.h similarity index 99% rename from ui/aura/root_window.h rename to ui/aura/window_event_dispatcher.h index bbdabd3f753c2b..9b46581d1b4b9b 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/window_event_dispatcher.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_AURA_ROOT_WINDOW_H_ -#define UI_AURA_ROOT_WINDOW_H_ +#ifndef UI_AURA_WINDOW_EVENT_DISPATCHER_H_ +#define UI_AURA_WINDOW_EVENT_DISPATCHER_H_ #include @@ -326,4 +326,4 @@ class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor, } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_H_ +#endif // UI_AURA_WINDOW_EVENT_DISPATCHER_H_ diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc similarity index 99% rename from ui/aura/root_window_unittest.cc rename to ui/aura/window_event_dispatcher_unittest.cc index f7111353336b64..9c10fd1afe1944 100644 --- a/ui/aura/root_window_unittest.cc +++ b/ui/aura/window_event_dispatcher_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include diff --git a/ui/aura/window_targeter.cc b/ui/aura/window_targeter.cc index 7db90de14af1f0..5df06b049f2805 100644 --- a/ui/aura/window_targeter.cc +++ b/ui/aura/window_targeter.cc @@ -7,9 +7,9 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/client/event_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event_target.h" namespace aura { diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc index 9143b85d46633f..4b8b69c7e2bf23 100644 --- a/ui/aura/window_tree_host.cc +++ b/ui/aura/window_tree_host.cc @@ -6,9 +6,9 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_transformer.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host_delegate.h" #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" diff --git a/ui/aura/window_tree_host_ozone.cc b/ui/aura/window_tree_host_ozone.cc index 0a8057b973f65e..6e9c8317dfc9da 100644 --- a/ui/aura/window_tree_host_ozone.cc +++ b/ui/aura/window_tree_host_ozone.cc @@ -4,7 +4,7 @@ #include "ui/aura/window_tree_host_ozone.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/ozone/event_factory_ozone.h" #include "ui/gfx/ozone/surface_factory_ozone.h" #include "ui/ozone/ozone_platform.h" diff --git a/ui/aura/window_tree_host_win.cc b/ui/aura/window_tree_host_win.cc index 53851df6b4cc14..9187e04689d1b0 100644 --- a/ui/aura/window_tree_host_win.cc +++ b/ui/aura/window_tree_host_win.cc @@ -10,7 +10,7 @@ #include "base/message_loop/message_loop.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor_loader_win.h" #include "ui/base/view_prop.h" #include "ui/events/event.h" diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc index 9ec1e6f2488d48..1421542a9d12ee 100644 --- a/ui/aura/window_tree_host_x11.cc +++ b/ui/aura/window_tree_host_x11.cc @@ -31,7 +31,7 @@ #include "ui/aura/client/screen_position_client.h" #include "ui/aura/client/user_action_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor.h" #include "ui/base/ui_base_switches.h" #include "ui/base/view_prop.h" diff --git a/ui/aura/window_tree_host_x11_unittest.cc b/ui/aura/window_tree_host_x11_unittest.cc index d6c9ccfc66d056..2fbdd463b2fc10 100644 --- a/ui/aura/window_tree_host_x11_unittest.cc +++ b/ui/aura/window_tree_host_x11_unittest.cc @@ -5,8 +5,8 @@ #include "base/sys_info.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host_delegate.h" #include "ui/aura/window_tree_host_x11.h" #include "ui/events/event_processor.h" diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index e3e81b2d04cb93..119b1698264102 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -18,7 +18,6 @@ #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/visibility_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/root_window_observer.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" @@ -26,6 +25,7 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/test/window_test_api.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_property.h" #include "ui/aura/window_tree_host.h" diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index 22f4cd8e9b18c7..d8c711e5e46a94 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -9,11 +9,11 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_factory.h" #include "ui/base/ime/text_input_client.h" diff --git a/ui/keyboard/keyboard_ui_handler.cc b/ui/keyboard/keyboard_ui_handler.cc index a626095b453886..c2398cacd714ed 100644 --- a/ui/keyboard/keyboard_ui_handler.cc +++ b/ui/keyboard/keyboard_ui_handler.cc @@ -13,8 +13,8 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/text_input_client.h" #include "ui/keyboard/keyboard_controller.h" diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc index 11260b73d68fa9..fb0b030c1d702e 100644 --- a/ui/keyboard/keyboard_util.cc +++ b/ui/keyboard/keyboard_util.cc @@ -14,7 +14,7 @@ #include "grit/keyboard_resources.h" #include "grit/keyboard_resources_map.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/text_input_client.h" #include "ui/keyboard/keyboard_switches.h" diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc index 228b0f1871b431..9ae21377ad8a58 100644 --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc @@ -33,8 +33,8 @@ #if defined(USE_AURA) #include "ui/aura/remote_window_tree_host_win.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace { diff --git a/ui/snapshot/snapshot_aura.cc b/ui/snapshot/snapshot_aura.cc index b40ea47ec1b85b..a360b87e116ff5 100644 --- a/ui/snapshot/snapshot_aura.cc +++ b/ui/snapshot/snapshot_aura.cc @@ -14,8 +14,8 @@ #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkPixelRef.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/compositor.h" #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 00b502973fda48..257f8548e9ea72 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/test/test_simple_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/compositor/test/draw_waiter_for_test.h" diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc index 617dfaf4bdc220..479f6e93d3917d 100644 --- a/ui/views/bubble/bubble_window_targeter_unittest.cc +++ b/ui/views/bubble/bubble_window_targeter_unittest.cc @@ -4,8 +4,8 @@ #include "ui/views/bubble/bubble_window_targeter.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc index ace0df7bc3ba4c..bc1931ade7f58a 100644 --- a/ui/views/controls/button/custom_button_unittest.cc +++ b/ui/views/controls/button/custom_button_unittest.cc @@ -17,9 +17,9 @@ #include "ui/views/test/views_test_base.h" #if defined(USE_AURA) -#include "ui/aura/root_window.h" #include "ui/aura/test/test_cursor_client.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif namespace views { diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 4ee0f5d6d9c6ed..baea405dbc2e75 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -43,7 +43,7 @@ #if defined(USE_AURA) #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #endif #if defined(OS_WIN) diff --git a/ui/views/corewm/base_focus_rules.cc b/ui/views/corewm/base_focus_rules.cc index 066627d77fb452..3674ff01fa3454 100644 --- a/ui/views/corewm/base_focus_rules.cc +++ b/ui/views/corewm/base_focus_rules.cc @@ -6,8 +6,8 @@ #include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/corewm/window_modality_controller.h" #include "ui/views/corewm/window_util.h" diff --git a/ui/views/corewm/capture_controller.cc b/ui/views/corewm/capture_controller.cc index 9a65e381da1242..686e8778681972 100644 --- a/ui/views/corewm/capture_controller.cc +++ b/ui/views/corewm/capture_controller.cc @@ -4,8 +4,8 @@ #include "ui/views/corewm/capture_controller.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace views { namespace corewm { diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc index a089e6ccb7509a..a4709860191570 100644 --- a/ui/views/corewm/capture_controller_unittest.cc +++ b/ui/views/corewm/capture_controller_unittest.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/views/corewm/compound_event_filter.cc index dec7e95c92bbd6..0e5609fe0d6bcd 100644 --- a/ui/views/corewm/compound_event_filter.cc +++ b/ui/views/corewm/compound_event_filter.cc @@ -10,9 +10,9 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/views/corewm/compound_event_filter_unittest.cc index 4e2ea8d77b1dd6..6a00c93405a995 100644 --- a/ui/views/corewm/compound_event_filter_unittest.cc +++ b/ui/views/corewm/compound_event_filter_unittest.cc @@ -7,12 +7,12 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_cursor_client.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc index 166a40ba46aa04..504b3dd614b70d 100644 --- a/ui/views/corewm/desktop_capture_controller_unittest.cc +++ b/ui/views/corewm/desktop_capture_controller_unittest.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" diff --git a/ui/views/corewm/focus_controller_unittest.cc b/ui/views/corewm/focus_controller_unittest.cc index 52faa4c52c86d8..c845592bf969a8 100644 --- a/ui/views/corewm/focus_controller_unittest.cc +++ b/ui/views/corewm/focus_controller_unittest.cc @@ -11,12 +11,12 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/focus_change_observer.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" #include "ui/events/event_handler.h" #include "ui/views/corewm/base_focus_rules.h" diff --git a/ui/views/corewm/input_method_event_filter.cc b/ui/views/corewm/input_method_event_filter.cc index 9e8843fc18ed43..0d1672a135df1e 100644 --- a/ui/views/corewm/input_method_event_filter.cc +++ b/ui/views/corewm/input_method_event_filter.cc @@ -5,7 +5,7 @@ #include "ui/views/corewm/input_method_event_filter.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_factory.h" #include "ui/events/event.h" diff --git a/ui/views/corewm/input_method_event_filter_unittest.cc b/ui/views/corewm/input_method_event_filter_unittest.cc index 2c95dc44e82d65..32995aba88b6b7 100644 --- a/ui/views/corewm/input_method_event_filter_unittest.cc +++ b/ui/views/corewm/input_method_event_filter_unittest.cc @@ -7,7 +7,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/corewm/compound_event_filter.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" diff --git a/ui/views/corewm/shadow_controller.cc b/ui/views/corewm/shadow_controller.cc index 7327f9281300ef..2ec2f151b3a46d 100644 --- a/ui/views/corewm/shadow_controller.cc +++ b/ui/views/corewm/shadow_controller.cc @@ -13,8 +13,8 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/env.h" #include "ui/aura/env_observer.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/compositor/layer.h" #include "ui/views/corewm/shadow.h" diff --git a/ui/views/corewm/shadow_controller_unittest.cc b/ui/views/corewm/shadow_controller_unittest.cc index b0d5f14612d95a..a21c057cd1e4ea 100644 --- a/ui/views/corewm/shadow_controller_unittest.cc +++ b/ui/views/corewm/shadow_controller_unittest.cc @@ -10,9 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/views/corewm/shadow.h" #include "ui/views/corewm/shadow_types.h" diff --git a/ui/views/corewm/tooltip_aura.cc b/ui/views/corewm/tooltip_aura.cc index 1214a6b8a2cbc5..99112f52448e04 100644 --- a/ui/views/corewm/tooltip_aura.cc +++ b/ui/views/corewm/tooltip_aura.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/strings/string_split.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/screen.h" #include "ui/gfx/text_elider.h" diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index 6dd86c02bfe142..b99586189e4838 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -9,12 +9,12 @@ #include "ui/aura/client/screen_position_client.h" #include "ui/aura/client/tooltip_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/point.h" diff --git a/ui/views/corewm/visibility_controller_unittest.cc b/ui/views/corewm/visibility_controller_unittest.cc index 1cf90aa5e18226..5439bca9ac23ab 100644 --- a/ui/views/corewm/visibility_controller_unittest.cc +++ b/ui/views/corewm/visibility_controller_unittest.cc @@ -4,11 +4,11 @@ #include "ui/views/corewm/visibility_controller.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/views/corewm/window_modality_controller.cc index d87f088e68b63a..68273fdad71892 100644 --- a/ui/views/corewm/window_modality_controller.cc +++ b/ui/views/corewm/window_modality_controller.cc @@ -9,8 +9,8 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/base/ui_base_types.h" #include "ui/events/event.h" diff --git a/ui/views/corewm/window_util.cc b/ui/views/corewm/window_util.cc index 64a23d12739b61..0c79df044162ab 100644 --- a/ui/views/corewm/window_util.cc +++ b/ui/views/corewm/window_util.cc @@ -5,8 +5,8 @@ #include "ui/views/corewm/window_util.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/views/corewm/transient_window_manager.h" #include "ui/views/view.h" diff --git a/ui/views/corewm/window_util_unittest.cc b/ui/views/corewm/window_util_unittest.cc index fdf3a46fa2fe70..c4cfd70869299f 100644 --- a/ui/views/corewm/window_util_unittest.cc +++ b/ui/views/corewm/window_util_unittest.cc @@ -4,9 +4,9 @@ #include "ui/views/corewm/window_util.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/test/test_layers.h" #include "ui/views/view_constants_aura.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/drag_utils.cc b/ui/views/drag_utils.cc index 0b9c31775a2741..a3307be40af024 100644 --- a/ui/views/drag_utils.cc +++ b/ui/views/drag_utils.cc @@ -9,8 +9,8 @@ #if defined(USE_AURA) #include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/event_utils_aura.cc b/ui/views/event_utils_aura.cc index 159ce7a7763c69..4ac21d106b6041 100644 --- a/ui/views/event_utils_aura.cc +++ b/ui/views/event_utils_aura.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/point.h" #include "ui/views/views_delegate.h" diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc index 30ebe3ae127bf7..7ac7e3fdd9a2f9 100644 --- a/ui/views/examples/content_client/examples_browser_main_parts.cc +++ b/ui/views/examples/content_client/examples_browser_main_parts.cc @@ -27,9 +27,9 @@ #endif #if defined(OS_CHROMEOS) -#include "ui/aura/root_window.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/wm/test/wm_test_helper.h" #endif diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc index d04ab57f50ad20..2819c5b17f6f87 100644 --- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/ui_controls_factory_aura.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/test/ui_controls_aura.h" #include "ui/base/x/x11_util.h" #include "ui/compositor/dip_util.h" diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index 5d4f8acc5b00c7..ff4eaa13bd2687 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -8,8 +8,8 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_helper.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/views/corewm/capture_controller.h" #include "ui/views/corewm/wm_state.h" diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index bb77ebfe2cf225..215014c64ae705 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -38,7 +38,7 @@ #include "ui/views/test/test_views_delegate.h" #endif #if defined(USE_AURA) -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/gestures/gesture_recognizer.h" #endif diff --git a/ui/views/widget/desktop_aura/desktop_capture_client.cc b/ui/views/widget/desktop_aura/desktop_capture_client.cc index 33054fe006dee5..121c0a2c1ef658 100644 --- a/ui/views/widget/desktop_aura/desktop_capture_client.cc +++ b/ui/views/widget/desktop_aura/desktop_capture_client.cc @@ -4,8 +4,8 @@ #include "ui/views/widget/desktop_aura/desktop_capture_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc index f57c694dceab94..63290b31343fd2 100644 --- a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc +++ b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc @@ -4,7 +4,7 @@ #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor_loader.h" #include "ui/base/cursor/cursors_aura.h" #include "ui/gfx/display.h" diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc index 3e3046494d9856..ef65d68801c0fc 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc @@ -12,8 +12,8 @@ #include "base/message_loop/message_pump_dispatcher.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/drag_drop_delegate.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drop_target_event.h" #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc index 57c81d5862869c..665f2826383414 100644 --- a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc +++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc @@ -8,7 +8,7 @@ #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/window.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drop_target_event.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.cc b/ui/views/widget/desktop_aura/desktop_focus_rules.cc index 475facf10cf931..c63250c42468a8 100644 --- a/ui/views/widget/desktop_aura/desktop_focus_rules.cc +++ b/ui/views/widget/desktop_aura/desktop_focus_rules.cc @@ -4,8 +4,8 @@ #include "ui/views/widget/desktop_aura/desktop_focus_rules.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc index cb86fe52f5cf96..0fa368027e0e01 100644 --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc @@ -4,7 +4,7 @@ #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor_loader.h" #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 45faed76433a78..e80db3e854cec0 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -12,8 +12,8 @@ #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_property.h" #include "ui/aura/window_tree_host.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc index a7c108dd4e40f2..3d9563581a08ad 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc @@ -5,9 +5,9 @@ #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client.cc b/ui/views/widget/desktop_aura/desktop_screen_position_client.cc index 4ccdce9bc4397f..23018c57ba7691 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_position_client.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.cc @@ -4,7 +4,7 @@ #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/screen.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc index 5c781a72735686..5cf42f538f8b20 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_win.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc @@ -5,8 +5,8 @@ #include "ui/views/widget/desktop_aura/desktop_screen_win.h" #include "base/logging.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/gfx/display.h" #include "ui/views/widget/desktop_aura/desktop_screen.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc index 252e6cb001ea30..58791e6f60b549 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc @@ -13,8 +13,8 @@ #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/x11/edid_parser_x11.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/base/layout.h" #include "ui/base/x/x11_util.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host.h b/ui/views/widget/desktop_aura/desktop_window_tree_host.h index a698db2c395260..dea1df1f6baf29 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host.h @@ -6,7 +6,7 @@ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_H_ #include "base/memory/scoped_ptr.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_types.h" #include "ui/views/views_export.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index fee9b0514be5ad..a644803332cadf 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -11,7 +11,7 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/scoped_tooltip_disabler.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/base/cursor/cursor_loader_win.h" #include "ui/base/ime/input_method.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc index fb2e0b0df0d778..8471a4cff7df50 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc @@ -4,7 +4,7 @@ #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index 53001d47def665..3c2423e99fb701 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -19,8 +19,8 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/user_action_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_property.h" #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" #include "ui/base/x/x11_util.h" diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc index 198b9c660707d6..d98dfa644354d2 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc +++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc @@ -9,7 +9,7 @@ #include "base/message_loop/message_loop.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/x/x11_util.h" #if !defined(OS_CHROMEOS) diff --git a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc index 77a4b214ea0fc8..1c3da3ba0f9d02 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc +++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc @@ -11,8 +11,8 @@ #include "base/message_loop/message_pump_x11.h" #include "base/run_loop.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/x/x11_util.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc index 9f15291ceef0f0..e8f48a02bc1455 100644 --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc @@ -13,8 +13,8 @@ #include "base/message_loop/message_pump_x11.h" #include "base/run_loop.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" #include "ui/base/x/x11_util.h" #include "ui/events/event.h" diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc index c43e192c21c40b..b6356fecdb61a7 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc @@ -10,9 +10,9 @@ #include #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 0af30a1bf34cd9..3d114a1d3fb3c6 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -16,8 +16,8 @@ #include "ui/aura/client/window_move_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/ui_base_types.h" diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index a600f4470804ad..ecf524f1b6612a 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -12,8 +12,8 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/layout/fill_layout.h" diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc index 2b33a1af94fe4d..05a96e5445ed1a 100644 --- a/ui/views/widget/tooltip_manager_aura.cc +++ b/ui/views/widget/tooltip_manager_aura.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/client/tooltip_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index ddc6e65eb4164b..f39cbfcbb115bf 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc @@ -14,8 +14,8 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #endif #if defined(USE_AURA) && !defined(OS_CHROMEOS) diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 075b2d6d09607d..27583c6ef24bc8 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -29,9 +29,9 @@ #if defined(USE_AURA) #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_tree_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/native_widget_aura.h" #if !defined(OS_CHROMEOS) #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" diff --git a/ui/views/widget/window_reorderer_unittest.cc b/ui/views/widget/window_reorderer_unittest.cc index 1d9566c916e928..67cf246e73aab2 100644 --- a/ui/views/widget/window_reorderer_unittest.cc +++ b/ui/views/widget/window_reorderer_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/test/test_layers.h" #include "ui/views/view.h" diff --git a/ui/views/win/hwnd_util_aurawin.cc b/ui/views/win/hwnd_util_aurawin.cc index 9fc6f10d816406..da4275e3bdd8be 100644 --- a/ui/views/win/hwnd_util_aurawin.cc +++ b/ui/views/win/hwnd_util_aurawin.cc @@ -4,8 +4,8 @@ #include "ui/views/win/hwnd_util.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/widget.h" namespace views { diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/test/wm_test_helper.cc index bb1753de807489..1df8ec0ecbb830 100644 --- a/ui/wm/test/wm_test_helper.cc +++ b/ui/wm/test/wm_test_helper.cc @@ -7,8 +7,8 @@ #include "ui/aura/client/default_activation_client.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/env.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/test_focus_client.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/views/corewm/compound_event_filter.h" #include "ui/views/corewm/input_method_event_filter.h"