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 /athena | |
| 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 'athena')
| -rw-r--r-- | athena/env/DEPS | 1 | ||||
| -rw-r--r-- | athena/env/athena_env_impl.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/athena/env/DEPS b/athena/env/DEPS index 82dec51..ebc1163 100644 --- a/athena/env/DEPS +++ b/athena/env/DEPS @@ -5,6 +5,7 @@ include_rules = [ "+ui/chromeos", "+ui/display", "+ui/events/devices", + "+ui/events/user_activity", "+ui/gfx", "+ui/wm", ] diff --git a/athena/env/athena_env_impl.cc b/athena/env/athena_env_impl.cc index 6b5975d..58b8490 100644 --- a/athena/env/athena_env_impl.cc +++ b/athena/env/athena_env_impl.cc @@ -18,6 +18,7 @@ #include "ui/aura/window_tree_host_observer.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/image_cursors.h" +#include "ui/base/user_activity/user_activity_detector.h" #include "ui/chromeos/user_activity_power_manager_notifier.h" #include "ui/display/chromeos/display_configurator.h" #include "ui/display/types/display_mode.h" @@ -31,7 +32,6 @@ #include "ui/wm/core/input_method_event_filter.h" #include "ui/wm/core/native_cursor_manager.h" #include "ui/wm/core/native_cursor_manager_delegate.h" -#include "ui/wm/core/user_activity_detector.h" namespace athena { @@ -245,7 +245,7 @@ class AthenaEnvImpl : public AthenaEnv, cursor_manager_->SetCursor(ui::kCursorPointer); aura::client::SetCursorClient(host_->window(), cursor_manager_.get()); - user_activity_detector_.reset(new wm::UserActivityDetector); + user_activity_detector_.reset(new ui::UserActivityDetector); host_->event_processor()->GetRootTarget()->AddPreTargetHandler( user_activity_detector_.get()); user_activity_notifier_.reset(new ui::UserActivityPowerManagerNotifier( @@ -395,7 +395,7 @@ class AthenaEnvImpl : public AthenaEnv, scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; scoped_ptr<wm::CursorManager> cursor_manager_; - scoped_ptr<wm::UserActivityDetector> user_activity_detector_; + scoped_ptr<ui::UserActivityDetector> user_activity_detector_; scoped_ptr<ui::DisplayConfigurator> display_configurator_; scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |