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

Side by Side Diff: services/ui/common/accelerator_util.h

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Adding 1 test that has two unique and one duped accelerators. Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
mfomitchev 2016/12/01 15:32:36 nit: 2016
thanhph 2016/12/01 19:03:19 Done.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_ 5 #ifndef SERVICES_UI_COMMON_ACCELERATOR_UTIL_H_
6 #define SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_ 6 #define SERVICES_UI_COMMON_ACCELERATOR_UTIL_H_
7 7
8 #include "services/ui/public/interfaces/event_matcher.mojom.h" 8 #include "services/ui/public/interfaces/event_matcher.mojom.h"
9 #include "services/ui/public/interfaces/window_manager.mojom.h"
9 #include "ui/events/mojo/event_constants.mojom.h" 10 #include "ui/events/mojo/event_constants.mojom.h"
10 #include "ui/events/mojo/keyboard_codes.mojom.h" 11 #include "ui/events/mojo/keyboard_codes.mojom.h"
11 12
12 namespace ui { 13 namespace ui {
13 14
14 // |flags| is a bitfield of kEventFlag* and kMouseEventFlag* values in 15 // |flags| is a bitfield of kEventFlag* and kMouseEventFlag* values in
15 // input_event_constants.mojom. 16 // input_event_constants.mojom.
16 mojom::EventMatcherPtr CreateKeyMatcher(ui::mojom::KeyboardCode code, 17 mojom::EventMatcherPtr CreateKeyMatcher(ui::mojom::KeyboardCode code,
17 int flags); 18 int flags);
18 19
20 // Construct accelerator vector from the provided |id| and |event_matcher|
21 std::vector<ui::mojom::AcceleratorPtr> CreateAcceleratorVector(
22 uint32_t id,
23 ui::mojom::EventMatcherPtr event_matcher);
24
25 // Construct accelerator from the provided |id| and |event_matcher|
26 ui::mojom::AcceleratorPtr CreateAccelerator(
27 uint32_t id,
28 ui::mojom::EventMatcherPtr event_matcher);
29
19 } // namespace ui 30 } // namespace ui
20 31
21 #endif // SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_ 32 #endif // SERVICES_UI_COMMON_ACCELERATOR_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698