Separates out accelerator handling in windowmanager

ash/mus/accelerator_registrar_impl.h

Index: ash/mus/accelerator_registrar_impl.h
diff --git a/ash/mus/accelerator_registrar_impl.h b/ash/mus/accelerator_registrar_impl.h
deleted file mode 100644
index bc8f5a79cd7a05cc54a04d62ee5e7706db4958df..0000000000000000000000000000000000000000
--- a/ash/mus/accelerator_registrar_impl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2015 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.
-
-#ifndef ASH_MUS_ACCELERATOR_REGISTRAR_IMPL_H_
-#define ASH_MUS_ACCELERATOR_REGISTRAR_IMPL_H_
-
-#include <stdint.h>
-
-#include <map>
-
-#include "ash/mus/window_manager_observer.h"
-#include "base/callback.h"
-#include "base/macros.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
-
-namespace ash {
-namespace mus {
-
-class WindowManager;
-
-// Manages AcceleratorHandlers from a particular AcceleratorRegistrar
-// connection. This manages its own lifetime, and destroys itself when the
-// AcceleratorRegistrar and all its AcceleratorHandlers are disconnected. Upon
-// destruction, it calls the DestroyCallback.
-class AcceleratorRegistrarImpl : public ::ui::mojom::AcceleratorRegistrar,
-                                 public WindowManagerObserver {
- public:
-  using DestroyCallback = base::Callback<void(AcceleratorRegistrarImpl*)>;
-  AcceleratorRegistrarImpl(WindowManager* window_manager,
-                           uint32_t accelerator_namespace,
-                           mojo::InterfaceRequest<AcceleratorRegistrar> request,
-                           const DestroyCallback& destroy_callback);
-
-  void Destroy();
-
-  // Returns true if this AcceleratorRegistrar has an accelerator with the
-  // specified id.
-  bool OwnsAccelerator(uint32_t accelerator_id) const;
-
-  void ProcessAccelerator(uint32_t accelerator_id, const ui::Event& event);
-
- private:
-  ~AcceleratorRegistrarImpl() override;
-
-  uint32_t ComputeAcceleratorId(uint32_t accelerator_id) const;
-  void OnBindingGone();
-  void OnHandlerGone();
-
-  void RemoveAllAccelerators();
-
-  // ::ui::mojom::AcceleratorRegistrar:
-  void SetHandler(::ui::mojom::AcceleratorHandlerPtr handler) override;
-  void AddAccelerator(uint32_t accelerator_id,
-                      ::ui::mojom::EventMatcherPtr matcher,
-                      const AddAcceleratorCallback& callback) override;
-  void RemoveAccelerator(uint32_t accelerator_id) override;
-
-  // WindowManagerObserver:
-  void OnAccelerator(uint32_t id, const ui::Event& event) override;
-  void OnWindowTreeClientDestroyed() override;
-
-  WindowManager* window_manager_;
-  ::ui::mojom::AcceleratorHandlerPtr accelerator_handler_;
-  mojo::Binding<AcceleratorRegistrar> binding_;
-  uint32_t accelerator_namespace_;
-  std::set<uint32_t> accelerators_;
-  DestroyCallback destroy_callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarImpl);
-};
-
-}  // namespace mus
-}  // namespace ash
-
-#endif  // ASH_MUS_ACCELERATOR_REGISTRAR_IMPL_H_