Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index ee93a3421deaaf6943c754ee4addbe33574dd964..6bf50fe06cfd5b3fc26c8eaef795f086e8e82a59 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()); |
oshima
2015/03/10 22:24:10
You need to remove the pre target handler in dtor.
afakhry
2015/03/10 22:28:58
I did that already above, didn't I? Am I missing s
oshima
2015/03/10 22:56:51
Oh, sorry. I somehow missed that change. ash lgtm
|
overlay_filter_.reset(new OverlayEventFilter); |
AddPreTargetHandler(overlay_filter_.get()); |