diff options
| author | afakhry <afakhry@chromium.org> | 2015-03-17 20:05:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 03:06:00 +0000 |
| commit | 00e8cbeb43eb3cc99ffed3bc29a8a539dfece0a6 (patch) | |
| tree | 368fe50de6b6fb1470be688bb1e3d7441f809fdf /extensions | |
| parent | beeac5732f89ff86b7e5482dc005016a52242290 (diff) | |
| download | chromium_src-00e8cbeb43eb3cc99ffed3bc29a8a539dfece0a6.zip chromium_src-00e8cbeb43eb3cc99ffed3bc29a8a539dfece0a6.tar.gz chromium_src-00e8cbeb43eb3cc99ffed3bc29a8a539dfece0a6.tar.bz2 | |
Fix for menus blocking user activity detection (Retry).
Original CL reverted here: https://codereview.chromium.org/998603003/
Menus used to block detecting user activity. The fix works by making the
UserActivityDetector a PlatformEventObserver rather than an
EventHandler.
Also made sure that PlatformEventSource has an instance in
ozone_platform_test.cc
TBR=oshima@chromium.org,jamescook@chromium.org
R=sadrul@chromium.org,alexst@chromium.org
BUG=462735
TEST=ui_base_unittests --gtest_filter=UserActivityDetectorTest.*
Review URL: https://codereview.chromium.org/1013003002
Cr-Commit-Position: refs/heads/master@{#321066}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/shell/browser/shell_desktop_controller_aura.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc index a3dcd6e..32983bb 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura.cc @@ -279,8 +279,6 @@ void ShellDesktopControllerAura::InitWindowManager() { aura::client::SetCursorClient(host_->window(), cursor_manager_.get()); user_activity_detector_.reset(new ui::UserActivityDetector); - host_->event_processor()->GetRootTarget()->AddPreTargetHandler( - user_activity_detector_.get()); #if defined(OS_CHROMEOS) user_activity_notifier_.reset( new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); @@ -324,10 +322,6 @@ void ShellDesktopControllerAura::DestroyRootWindow() { host_->RemoveObserver(this); if (input_method_filter_) root_window_event_filter_->RemoveHandler(input_method_filter_.get()); - if (user_activity_detector_) { - host_->event_processor()->GetRootTarget()->RemovePreTargetHandler( - user_activity_detector_.get()); - } wm::FocusController* focus_controller = static_cast<wm::FocusController*>(focus_client_.get()); if (focus_controller) { |