diff options
| author | sammc <sammc@chromium.org> | 2016-01-20 21:30:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-21 05:31:02 +0000 |
| commit | 16fb38a8b87fe700645055e472d84de7aefe48a5 (patch) | |
| tree | 02d83267f9a8a9f8e182c6a857347a7a683e81e6 /mash/browser_driver | |
| parent | c8a1187b4dfc11061d8ba792c73225196c56c6aa (diff) | |
| download | chromium_src-16fb38a8b87fe700645055e472d84de7aefe48a5.zip chromium_src-16fb38a8b87fe700645055e472d84de7aefe48a5.tar.gz chromium_src-16fb38a8b87fe700645055e472d84de7aefe48a5.tar.bz2 | |
Change mojo enums to be scoped enums in the generated C++ bindings.
Some mojo enums were previously not proper enums: they were constants
for bitfields. These have been replaced by const int32s in the mojoms:
- mus.mojom.EventFlags
- mus.mojom.MouseEventFlags
- mus.mojom.ResizeBehavior
- mus.mojom.WindowTree.AccessPolicy
Some mojo enum values now conflict with macros (mostly on Windows) and
needed to change:
- mus.mojom.Cursor.NULL became CURSOR_NULL (again)
- mus.mojom.KeyboardCode.DELETE became DELETE_KEY
- mus.mojom.WindowManagerErrorCode.ERROR_ACCESS_DENIED became
ACCESS_DENIED
- device.usb.TransferDirection.IN became INBOUND
- device.usb.TransferDirection.OUT became OUTBOUND
- device.usb.TransferStatus.ERROR became TRANSFER_ERROR
- device.NFCRecordType.OPAQUE became OPAQUE_RECORD
- media.interfaces.Decryptor.Status.ERROR became DECRYPTION_ERROR
- skia.AlphaType.OPAQUE became ALPHA_TYPE_OPAQUE
Review URL: https://codereview.chromium.org/1527183003
Cr-Commit-Position: refs/heads/master@{#370632}
Diffstat (limited to 'mash/browser_driver')
| -rw-r--r-- | mash/browser_driver/browser_driver_application_delegate.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/mash/browser_driver/browser_driver_application_delegate.cc b/mash/browser_driver/browser_driver_application_delegate.cc index ebd41dc..62fdccf 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) { |