Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: ash/mus/accelerators/accelerator_controller_registrar_test_api.cc

Issue 2694623016: chromeos: Makes AshTestBase/Helper target mash when appropriate (Closed)
Patch Set: feedback Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/mus/accelerators/accelerator_controller_registrar_test_api.cc
diff --git a/ash/mus/accelerators/accelerator_controller_registrar_test_api.cc b/ash/mus/accelerators/accelerator_controller_registrar_test_api.cc
deleted file mode 100644
index ce70d2feab654d8b504cdd9a757409041a68e43d..0000000000000000000000000000000000000000
--- a/ash/mus/accelerators/accelerator_controller_registrar_test_api.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 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/mus/accelerators/accelerator_controller_registrar_test_api.h"
-
-#include "ash/mus/accelerators/accelerator_controller_registrar.h"
-#include "ash/mus/accelerators/accelerator_ids.h"
-#include "ash/mus/bridge/wm_shell_mus_test_api.h"
-#include "ui/base/accelerators/accelerator.h"
-#include "ui/events/event.h"
-
-namespace ash {
-namespace mus {
-
-AcceleratorControllerRegistrarTestApi::AcceleratorControllerRegistrarTestApi() {
-}
-
-AcceleratorControllerRegistrarTestApi::
- ~AcceleratorControllerRegistrarTestApi() {}
-
-void AcceleratorControllerRegistrarTestApi::ProcessAccelerator(
- const ui::Accelerator& accelerator) {
- const ui::KeyEvent key_event(accelerator.type(), accelerator.key_code(),
- accelerator.modifiers());
- AcceleratorControllerRegistrar* registrar =
- WmShellMusTestApi().accelerator_controller_registrar();
- const AcceleratorControllerRegistrar::Ids& ids =
- registrar->accelerator_to_ids_[accelerator];
- const uint32_t pre_id =
- ComputeAcceleratorId(registrar->id_namespace_, ids.pre_id);
- if (registrar->OnAccelerator(pre_id, key_event) ==
- ui::mojom::EventResult::HANDLED) {
- return;
- }
-
- const uint32_t post_id =
- ComputeAcceleratorId(registrar->id_namespace_, ids.post_id);
- registrar->OnAccelerator(post_id, key_event);
-}
-
-} // namespace mus
-} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698