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

Unified Diff: mash/wm/frame/move_loop.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/wm/frame/move_event_handler.cc ('k') | mash/wm/non_client_frame_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/frame/move_loop.cc
diff --git a/mash/wm/frame/move_loop.cc b/mash/wm/frame/move_loop.cc
index ca37b087d9ee161bf8c2536fb35ed2a4de254bd1..1aac3ce9614a0eb8928158b0795f321d72cd86dd 100644
--- a/mash/wm/frame/move_loop.cc
+++ b/mash/wm/frame/move_loop.cc
@@ -23,11 +23,10 @@ gfx::Point EventScreenLocationToPoint(const mus::mojom::Event& event) {
event.pointer_data->location->screen_y));
}
-mus::mojom::EventFlags MouseOnlyEventFlags(mus::mojom::EventFlags flags) {
- return static_cast<mus::mojom::EventFlags>(
- flags & (mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON |
- mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON |
- mus::mojom::EVENT_FLAGS_RIGHT_MOUSE_BUTTON));
+int MouseOnlyEventFlags(int flags) {
+ return flags & (mus::mojom::kEventFlagLeftMouseButton |
+ mus::mojom::kEventFlagMiddleMouseButton |
+ mus::mojom::kEventFlagRightMouseButton);
}
} // namespace
@@ -41,11 +40,11 @@ MoveLoop::~MoveLoop() {
scoped_ptr<MoveLoop> MoveLoop::Create(mus::Window* target,
int ht_location,
const mus::mojom::Event& event) {
- DCHECK_EQ(event.action, mus::mojom::EVENT_TYPE_POINTER_DOWN);
+ DCHECK_EQ(event.action, mus::mojom::EventType::POINTER_DOWN);
// Start a move on left mouse, or any other type of pointer.
- if (event.pointer_data->kind == mus::mojom::POINTER_KIND_MOUSE &&
+ if (event.pointer_data->kind == mus::mojom::PointerKind::MOUSE &&
MouseOnlyEventFlags(event.flags) !=
- mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
+ mus::mojom::kEventFlagLeftMouseButton) {
return nullptr;
}
@@ -60,7 +59,7 @@ scoped_ptr<MoveLoop> MoveLoop::Create(mus::Window* target,
MoveLoop::MoveResult MoveLoop::Move(const mus::mojom::Event& event) {
switch (event.action) {
- case mus::mojom::EVENT_TYPE_POINTER_CANCEL:
+ case mus::mojom::EventType::POINTER_CANCEL:
if (event.pointer_data->pointer_id == pointer_id_) {
if (target_)
Revert();
@@ -68,12 +67,12 @@ MoveLoop::MoveResult MoveLoop::Move(const mus::mojom::Event& event) {
}
return MoveResult::CONTINUE;
- case mus::mojom::EVENT_TYPE_POINTER_MOVE:
+ case mus::mojom::EventType::POINTER_MOVE:
if (target_ && event.pointer_data->pointer_id == pointer_id_)
MoveImpl(event);
return MoveResult::CONTINUE;
- case mus::mojom::EVENT_TYPE_POINTER_UP:
+ case mus::mojom::EventType::POINTER_UP:
if (event.pointer_data->pointer_id == pointer_id_) {
// TODO(sky): need to support changed_flags.
if (target_)
« no previous file with comments | « mash/wm/frame/move_event_handler.cc ('k') | mash/wm/non_client_frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698