Revert 251382 "event-rewrite: Clean up how events are rewritten."

trunk/src/ash/accelerators/accelerator_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_dispatcher.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 // Xlib defines RootWindow
 #ifdef RootWindow
 #undef RootWindow
 #endif
 #endif  // defined(USE_X11)
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/event_rewriter_event_filter.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/menu/menu_controller.h"
 
 namespace ash {
 namespace {
@@ skipping 57 matching lines @@
 }
 
 uint32_t AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) {
   if (!associated_window_)
     return POST_DISPATCH_QUIT_LOOP;
 
   if (!associated_window_->CanReceiveEvents())
     return POST_DISPATCH_PERFORM_DEFAULT;
 
   if (IsKeyEvent(event)) {
+    // Modifiers can be changed by the user preference, so we need to rewrite
+    // the event explicitly.
     ui::KeyEvent key_event(event, false);
+    ui::EventHandler* event_rewriter =
+        ash::Shell::GetInstance()->event_rewriter_filter();
+    DCHECK(event_rewriter);
+    event_rewriter->OnKeyEvent(&key_event);
+    if (key_event.stopped_propagation())
+      return POST_DISPATCH_NONE;
+
     if (IsPossibleAcceleratorNotForMenu(key_event)) {
       if (views::MenuController* menu_controller =
           views::MenuController::GetActiveInstance()) {
         menu_controller->CancelAll();
 #if defined(USE_X11)
         XPutBackEvent(event->xany.display, event);
 #else
         NOTIMPLEMENTED() << " Repost NativeEvent here.";
 #endif
         return POST_DISPATCH_QUIT_LOOP;
@@ skipping 15 matching lines @@
         return POST_DISPATCH_NONE;
     }
 
     return nested_dispatcher_->Dispatch(key_event.native_event());
   }
 
   return nested_dispatcher_->Dispatch(event);
 }
 
 }  // namespace ash