| Index: ash/mus/accelerators/accelerator_registrar_unittest.cc
|
| diff --git a/ash/mus/accelerators/accelerator_registrar_unittest.cc b/ash/mus/accelerators/accelerator_registrar_unittest.cc
|
| index 240fb8a8ee8f5a779bfe854743137110ff1ec524..8dffdb0d8e09623d91312701e4286768c80ceb5f 100644
|
| --- a/ash/mus/accelerators/accelerator_registrar_unittest.cc
|
| +++ b/ash/mus/accelerators/accelerator_registrar_unittest.cc
|
| @@ -15,10 +15,10 @@
|
| #include "services/ui/public/cpp/window.h"
|
| #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
|
|
|
| -using ::ui::mojom::AcceleratorHandler;
|
| -using ::ui::mojom::AcceleratorHandlerPtr;
|
| -using ::ui::mojom::AcceleratorRegistrar;
|
| -using ::ui::mojom::AcceleratorRegistrarPtr;
|
| +using ui::mojom::AcceleratorHandler;
|
| +using ui::mojom::AcceleratorHandlerPtr;
|
| +using ui::mojom::AcceleratorRegistrar;
|
| +using ui::mojom::AcceleratorRegistrarPtr;
|
|
|
| namespace ash {
|
| namespace mus {
|
| @@ -36,7 +36,7 @@ class TestAcceleratorHandler : public AcceleratorHandler {
|
| // Attempts to install an accelerator with the specified id and event matcher.
|
| // Returns whether the accelerator could be successfully added or not.
|
| bool AttemptToInstallAccelerator(uint32_t accelerator_id,
|
| - ::ui::mojom::EventMatcherPtr matcher) {
|
| + ui::mojom::EventMatcherPtr matcher) {
|
| DCHECK(!run_loop_);
|
| registrar_->AddAccelerator(
|
| accelerator_id, std::move(matcher),
|
| @@ -86,13 +86,13 @@ TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
|
| ConnectToRegistrar(®istrar_first);
|
| TestAcceleratorHandler handler_first(std::move(registrar_first));
|
| EXPECT_TRUE(handler_first.AttemptToInstallAccelerator(
|
| - 1, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::T,
|
| - ui::mojom::kEventFlagShiftDown)));
|
| + 1, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::T,
|
| + ui::mojom::kEventFlagShiftDown)));
|
| // Attempting to add an accelerator with the same accelerator id from the same
|
| // registrar should fail.
|
| EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
|
| - 1, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| - ui::mojom::kEventFlagShiftDown)));
|
| + 1, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| + ui::mojom::kEventFlagShiftDown)));
|
|
|
| // Attempting to add an accelerator with the same id from a different
|
| // registrar should be OK.
|
| @@ -100,17 +100,17 @@ TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
|
| ConnectToRegistrar(®istrar_second);
|
| TestAcceleratorHandler handler_second(std::move(registrar_second));
|
| EXPECT_TRUE(handler_second.AttemptToInstallAccelerator(
|
| - 1, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| - ui::mojom::kEventFlagShiftDown)));
|
| + 1, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| + ui::mojom::kEventFlagShiftDown)));
|
|
|
| // But attempting to add an accelerator with the same matcher should fail.
|
| // Temporarily commented out until we sort out http://crbug.com/631836.
|
| /*
|
| EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
|
| - 3, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| + 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| ui::mojom::kEventFlagShiftDown)));
|
| EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
|
| - 3, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| + 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
|
| ui::mojom::kEventFlagShiftDown)));
|
| */
|
| }
|
|
|