Chromium Code Reviews| 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 fa04ab9486331a8f75ef83970c16c863c21c6235..c44af6455370c12f4d0e6feb67937000a697b7a5 100644 |
| --- a/mash/browser_driver/browser_driver_application_delegate.cc |
| +++ b/mash/browser_driver/browser_driver_application_delegate.cc |
| @@ -24,20 +24,16 @@ enum class Accelerator : uint32_t { |
| struct AcceleratorSpec { |
| Accelerator id; |
| mus::mojom::KeyboardCode keyboard_code; |
| - mus::mojom::EventFlags event_flags; |
| + int event_flags; |
|
yzshen1
2016/01/07 19:24:52
Please add comment.
Sam McNally
2016/01/08 05:12:51
Done.
|
| }; |
| 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) { |