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 /ash | |
| 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 'ash')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index ee93a34..6bf50fe 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -678,7 +678,6 @@ Shell::~Shell() { RemovePreTargetHandler(speech_feedback_handler_.get()); speech_feedback_handler_.reset(); #endif - RemovePreTargetHandler(user_activity_detector_.get()); RemovePreTargetHandler(overlay_filter_.get()); RemovePreTargetHandler(input_method_filter_.get()); RemovePreTargetHandler(accelerator_filter_.get()); @@ -922,7 +921,6 @@ void Shell::Init(const ShellInitParams& init_params) { // ui::UserActivityDetector passes events to observers, so let them get // rewritten first. user_activity_detector_.reset(new ui::UserActivityDetector); - AddPreTargetHandler(user_activity_detector_.get()); overlay_filter_.reset(new OverlayEventFilter); AddPreTargetHandler(overlay_filter_.get()); |