Skip to content

Commit

Permalink
Move root_window.* to window_event_dispatcher.*
Browse files Browse the repository at this point in the history 
http://crbug.com/308843
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/174803002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252651 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
ben@chromium.org committed Feb 21, 2014
1 parent 8c1e5e5 commit fcc51c9
Show file tree
Hide file tree
Showing 338 changed files with 352 additions and 352 deletions.
2 changes: 1 addition & 1 deletion apps/shell/browser/shell_browser_main_parts.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/accelerator_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/accelerator_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/accelerator_dispatcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/accelerator_filter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/key_hold_detector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/nested_dispatcher_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/autoclick/autoclick_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/autoclick/autoclick_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/cancel_mode.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ash/debug.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ash/desktop_background/desktop_background_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/desktop_background/desktop_background_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/desktop_background/desktop_background_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/desktop_background/desktop_background_widget_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/dip_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/cursor_window_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/display_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/display_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/display_manager_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/event_transformation_handler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/mirror_window_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/mirror_window_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ash/display/mouse_cursor_event_filter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/mouse_cursor_event_filter_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/display/output_configurator_animation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/root_window_transformers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/root_window_transformers_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/screen_ash.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/display/screen_position_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/screen_position_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/display/shared_display_edge_indicator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/display/virtual_keyboard_window_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ash/drag_drop/drag_drop_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/drag_drop/drag_drop_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/drag_drop/drag_drop_interactive_uitest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/drag_drop/drag_drop_tracker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ash/drag_drop/drag_drop_tracker_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ash/extended_desktop_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ash/first_run/desktop_cleaner.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit fcc51c9

Please sign in to comment.