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

Unified Diff: mash/wm/accelerator_registrar_apptest.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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
« no previous file with comments | « mash/wallpaper/wallpaper.cc ('k') | mash/wm/frame/move_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/accelerator_registrar_apptest.cc
diff --git a/mash/wm/accelerator_registrar_apptest.cc b/mash/wm/accelerator_registrar_apptest.cc
index eaccd5b2e5dff94398e280f03c4629ebe4a961a0..083f8c81a7c8137e7ef98c0b3c00ad5cf5084ee6 100644
--- a/mash/wm/accelerator_registrar_apptest.cc
+++ b/mash/wm/accelerator_registrar_apptest.cc
@@ -88,13 +88,13 @@ TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
ConnectToRegistrar(&registrar_first);
TestAcceleratorHandler handler_first(std::move(registrar_first));
EXPECT_TRUE(handler_first.AttemptToInstallAccelerator(
- 1, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_T,
- mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+ 1, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::T,
+ mus::mojom::kEventFlagShiftDown)));
// Attempting to add an accelerator with the same accelerator id from the same
// registrar should fail.
EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
- 1, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
- mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+ 1, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+ mus::mojom::kEventFlagShiftDown)));
// Attempting to add an accelerator with the same id from a different
// registrar should be OK.
@@ -102,16 +102,16 @@ TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
ConnectToRegistrar(&registrar_second);
TestAcceleratorHandler handler_second(std::move(registrar_second));
EXPECT_TRUE(handler_second.AttemptToInstallAccelerator(
- 1, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
- mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+ 1, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+ mus::mojom::kEventFlagShiftDown)));
// But attempting to add an accelerator with the same matcher should fail.
EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
- 3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
- mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+ 3, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+ mus::mojom::kEventFlagShiftDown)));
EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
- 3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
- mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+ 3, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+ mus::mojom::kEventFlagShiftDown)));
}
} // namespace wm
« no previous file with comments | « mash/wallpaper/wallpaper.cc ('k') | mash/wm/frame/move_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698