diff options
| author | derat <derat@chromium.org> | 2015-01-09 08:09:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 16:10:38 +0000 |
| commit | 2d4e62d2cbd43d83fc43d58f0fdaa904633c33c1 (patch) | |
| tree | ddd95fed9a581cacdc16b6f2838d31ebeca9b417 /ash/shell.cc | |
| parent | 12e8838a9b9a1fca7fbffe82a6e34f706ac1f342 (diff) | |
| download | chromium_src-2d4e62d2cbd43d83fc43d58f0fdaa904633c33c1.zip chromium_src-2d4e62d2cbd43d83fc43d58f0fdaa904633c33c1.tar.gz chromium_src-2d4e62d2cbd43d83fc43d58f0fdaa904633c33c1.tar.bz2 | |
Move UserActivityDetector to ui/base/user_activity/.
Move UserActivityDetector and UserActivityObserver out of
ui/wm/core/ so that other classes in ui/base/ can depend on
them. This is needed in order to be able to later move
chrome/browser/idle_chromeos.cc out of chrome/ so that the
chrome.idle API can eventually be moved to extensions/.
BUG=446320
Review URL: https://codereview.chromium.org/833893003
Cr-Commit-Position: refs/heads/master@{#310773}
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 9062d81..96fc38c 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -86,6 +86,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" +#include "ui/base/user_activity/user_activity_detector.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/events/event_target_iterator.h" @@ -109,7 +110,6 @@ #include "ui/wm/core/input_method_event_filter.h" #include "ui/wm/core/nested_accelerator_controller.h" #include "ui/wm/core/shadow_controller.h" -#include "ui/wm/core/user_activity_detector.h" #include "ui/wm/core/visibility_controller.h" #include "ui/wm/core/window_modality_controller.h" @@ -914,9 +914,9 @@ void Shell::Init(const ShellInitParams& init_params) { // The order in which event filters are added is significant. - // wm::UserActivityDetector passes events to observers, so let them get + // ui::UserActivityDetector passes events to observers, so let them get // rewritten first. - user_activity_detector_.reset(new ::wm::UserActivityDetector); + user_activity_detector_.reset(new ui::UserActivityDetector); AddPreTargetHandler(user_activity_detector_.get()); overlay_filter_.reset(new OverlayEventFilter); |