More accelerator code leanup

ui/wm/core/nested_accelerator_dispatcher_win.cc

 // Copyright 2014 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 "ui/wm/core/nested_accelerator_dispatcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_dispatcher.h"
 #include "base/run_loop.h"
+#include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event.h"
+#include "ui/wm/core/accelerator_filter.h"
 #include "ui/wm/core/nested_accelerator_delegate.h"
 
 using base::MessagePumpDispatcher;
 
 namespace wm {
 
 namespace {
 
 bool IsKeyEvent(const MSG& msg) {
   return msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN ||
@@ skipping 13 matching lines @@
  private:
   // NestedAcceleratorDispatcher:
   virtual scoped_ptr<base::RunLoop> CreateRunLoop() OVERRIDE {
     return scoped_ptr<base::RunLoop>(new base::RunLoop(this));
   }
 
   // MessagePumpDispatcher:
   virtual uint32_t Dispatch(const MSG& event) OVERRIDE {
     if (IsKeyEvent(event)) {
       ui::KeyEvent key_event(event, false);
-      if (!delegate_->ShouldProcessEventNow(key_event))
-        return POST_DISPATCH_QUIT_LOOP;
+      ui::Accelerator accelerator = CreateAcceleratorFromKeyEvent(key_event);
 
-      if (delegate_->ProcessEvent(key_event))
-        return POST_DISPATCH_NONE;
+      switch (delegate_->ProcessAccelerator(accelerator)) {
+        case NestedAcceleratorDelegate::RESULT_PROCESS_LATER:
+          return POST_DISPATCH_QUIT_LOOP;
+        case NestedAcceleratorDelegate::RESULT_PROCESSED:
+          return POST_DISPATCH_NONE;
+        case NestedAcceleratorDelegate::RESULT_NOT_PROCESSED:
+          break;
+      }
     }
 
     return nested_dispatcher_ ? nested_dispatcher_->Dispatch(event)
                               : POST_DISPATCH_PERFORM_DEFAULT;
   }
 
   MessagePumpDispatcher* nested_dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDispatcherWin);
 };
 
 scoped_ptr<NestedAcceleratorDispatcher> NestedAcceleratorDispatcher::Create(
     NestedAcceleratorDelegate* delegate,
     MessagePumpDispatcher* nested_dispatcher) {
   return scoped_ptr<NestedAcceleratorDispatcher>(
       new NestedAcceleratorDispatcherWin(delegate, nested_dispatcher));
 }
 
 }  // namespace wm