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

Unified Diff: mash/browser_driver/browser_driver_application_delegate.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 | « mandoline/ui/omnibox/omnibox_application.cc ('k') | mash/shelf/shelf_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/browser_driver/browser_driver_application_delegate.cc
diff --git a/mash/browser_driver/browser_driver_application_delegate.cc b/mash/browser_driver/browser_driver_application_delegate.cc
index ebd41dc01ddd1980b97798bde6c216b8f506c5c9..62fdccf741d71f6febec3307f6088b1f9c382825 100644
--- a/mash/browser_driver/browser_driver_application_delegate.cc
+++ b/mash/browser_driver/browser_driver_application_delegate.cc
@@ -24,20 +24,18 @@ enum class Accelerator : uint32_t {
struct AcceleratorSpec {
Accelerator id;
mus::mojom::KeyboardCode keyboard_code;
- mus::mojom::EventFlags event_flags;
+ // A bitfield of kEventFlag* and kMouseEventFlag* values in
+ // input_event_constants.mojom.
+ int event_flags;
};
AcceleratorSpec g_spec[] = {
- { Accelerator::NewWindow,
- mus::mojom::KEYBOARD_CODE_N,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN },
- { Accelerator::NewTab,
- mus::mojom::KEYBOARD_CODE_T,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN },
- { Accelerator::NewIncognitoWindow,
- mus::mojom::KEYBOARD_CODE_N,
- static_cast<mus::mojom::EventFlags>(mus::mojom::EVENT_FLAGS_CONTROL_DOWN |
- mus::mojom::EVENT_FLAGS_SHIFT_DOWN) },
+ {Accelerator::NewWindow, mus::mojom::KeyboardCode::N,
+ mus::mojom::kEventFlagControlDown},
+ {Accelerator::NewTab, mus::mojom::KeyboardCode::T,
+ mus::mojom::kEventFlagControlDown},
+ {Accelerator::NewIncognitoWindow, mus::mojom::KeyboardCode::N,
+ mus::mojom::kEventFlagControlDown | mus::mojom::kEventFlagShiftDown},
};
void AssertTrue(bool success) {
« no previous file with comments | « mandoline/ui/omnibox/omnibox_application.cc ('k') | mash/shelf/shelf_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698