Refactor and move ash independent nested accelerator code to ui/wm/core

ash/accelerators/nested_accelerator_delegate.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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"
+#include "ash/accelerators/nested_accelerator_delegate.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ui/aura/window_event_dispatcher.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"
 
@@ skipping 12 matching lines @@
         (key_code >= ui::VKEY_0 && key_code <= ui::VKEY_9) ||
         (key_code == ui::VKEY_TAB)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace
 
-bool AcceleratorDispatcher::MenuClosedForPossibleAccelerator(
+NestedAcceleratorDelegate::NestedAcceleratorDelegate() {
+}
+
+NestedAcceleratorDelegate::~NestedAcceleratorDelegate() {
+}
+
+bool NestedAcceleratorDelegate::ShouldProcessEventNow(
     const ui::KeyEvent& key_event) {
   if (!IsPossibleAcceleratorNotForMenu(key_event))
-    return false;
+    return true;
 
   if (views::MenuController* menu_controller =
           views::MenuController::GetActiveInstance()) {
     menu_controller->CancelAll();
-    return true;
+    return false;
   }
-  return false;
+  return true;
 }
 
-bool AcceleratorDispatcher::AcceleratorProcessedForKeyEvent(
-    const ui::KeyEvent& key_event) {
+bool NestedAcceleratorDelegate::ProcessEvent(const ui::KeyEvent& key_event) {
   ash::AcceleratorController* accelerator_controller =
       ash::Shell::GetInstance()->accelerator_controller();
   if (!accelerator_controller)
     return false;
   const int kModifierMask =
       (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN);
   ui::Accelerator accelerator(key_event.key_code(),
                               key_event.flags() & kModifierMask);
   if (key_event.type() == ui::ET_KEY_RELEASED)
     accelerator.set_type(ui::ET_KEY_RELEASED);
   // Fill out context object so AcceleratorController will know what
   // was the previous accelerator or if the current accelerator is repeated.
   Shell::GetInstance()->accelerator_controller()->context()->UpdateContext(
       accelerator);
   return accelerator_controller->Process(accelerator);
 }
 
 }  // namespace ash