Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ash / accelerators / accelerator_dispatcher.cc

diff --git a/src/ash/accelerators/accelerator_dispatcher.cc b/src/ash/accelerators/accelerator_dispatcher.cc
index 7d29e68..6088dfe 100644 (file)
--- a/src/ash/accelerators/accelerator_dispatcher.cc
+++ b/src/ash/accelerators/accelerator_dispatcher.cc
@@ -15,7 +15,6 @@
 
 #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"
@@ -85,23 +84,15 @@ void AcceleratorDispatcher::OnWindowDestroying(aura::Window* window) {
     associated_window_ = NULL;
 }
 
-bool AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) {
+uint32_t AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) {
   if (!associated_window_)
-    return false;
-  if (!ui::IsNoopEvent(event) && !associated_window_->CanReceiveEvents())
-    return aura::Env::GetInstance()->GetDispatcher()->Dispatch(event);
+    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 true;
-
     if (IsPossibleAcceleratorNotForMenu(key_event)) {
       if (views::MenuController* menu_controller =
           views::MenuController::GetActiveInstance()) {
@@ -111,7 +102,7 @@ bool AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) {
 #else
         NOTIMPLEMENTED() << " Repost NativeEvent here.";
 #endif
-        return false;
+        return POST_DISPATCH_QUIT_LOOP;
       }
     }
 
@@ -127,7 +118,7 @@ bool AcceleratorDispatcher::Dispatch(const base::NativeEvent& event) {
       Shell::GetInstance()->accelerator_controller()->context()->
           UpdateContext(accelerator);
       if (accelerator_controller->Process(accelerator))
-        return true;
+        return POST_DISPATCH_NONE;
     }
 
     return nested_dispatcher_->Dispatch(key_event.native_event());