Fix for menus blocking user activity detection (Retry 2).

extensions/shell/browser/shell_desktop_controller_aura.cc

Index: extensions/shell/browser/shell_desktop_controller_aura.cc
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc
index 1f45df249e6f6a9b17581e6ba065bb25252e27a0..ffa1383d68ce8a5ed0d0067ae62e5c5043fad19a 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) {