diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 21:31:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 21:31:26 +0000 |
| commit | fcc51c95bcff73f377f4a2986d5cfb685b6af894 (patch) | |
| tree | a5a92079c01fa4cfba1a25f48ed89153168181ca /ash/accelerators | |
| parent | 8c1e5e52ba640bc6a42a2cdfd25184f90a551975 (diff) | |
| download | chromium_src-fcc51c95bcff73f377f4a2986d5cfb685b6af894.zip chromium_src-fcc51c95bcff73f377f4a2986d5cfb685b6af894.tar.gz chromium_src-fcc51c95bcff73f377f4a2986d5cfb685b6af894.tar.bz2 | |
Move root_window.* to window_event_dispatcher.*
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
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_dispatcher.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_filter.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/key_hold_detector.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/nested_dispatcher_controller_unittest.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index f89a4aa..6961999 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 bd4a9d0..b59e901 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 6088dfe..0395ee7 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 1ce80c7..7e04310 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 4b99820..95ded1a 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 3749c7f..67f528b 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" |