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

Unified Diff: services/view_manager/gesture_manager.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 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 | « services/view_manager/display_manager.cc ('k') | services/view_manager/gesture_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/view_manager/gesture_manager.cc
diff --git a/services/view_manager/gesture_manager.cc b/services/view_manager/gesture_manager.cc
index ea1494c3d8ad0566f3c7c56fe8c919eb032f3c0c..2d1ddf1cf3a0917adbdf456c7880aa5d71a4e798 100644
--- a/services/view_manager/gesture_manager.cc
+++ b/services/view_manager/gesture_manager.cc
@@ -482,8 +482,8 @@ void GestureManager::Pointer::ChooseGestureIfPossible() {
bool GestureManager::Pointer::ScheduleDeleteIfNecessary() {
if (current_event_ &&
- (current_event_->action == mojo::EVENT_TYPE_POINTER_UP ||
- current_event_->action == mojo::EVENT_TYPE_POINTER_CANCEL)) {
+ (current_event_->action == mojo::EventType::POINTER_UP ||
+ current_event_->action == mojo::EventType::POINTER_CANCEL)) {
gesture_manager_->ScheduleDelete(this);
return true;
}
@@ -547,7 +547,7 @@ bool GestureManager::ProcessEvent(const mojo::Event& event) {
const gfx::Point location(static_cast<int>(event.pointer_data->x),
static_cast<int>(event.pointer_data->y));
switch (event.action) {
- case mojo::EVENT_TYPE_POINTER_DOWN: {
+ case mojo::EventType::POINTER_DOWN: {
if (GetPointerById(event.pointer_data->pointer_id)) {
DVLOG(1) << "received more than one down for a pointer without a "
<< "corresponding up, id=" << event.pointer_data->pointer_id;
@@ -566,9 +566,9 @@ bool GestureManager::ProcessEvent(const mojo::Event& event) {
return true;
}
- case mojo::EVENT_TYPE_POINTER_CANCEL:
- case mojo::EVENT_TYPE_POINTER_MOVE:
- case mojo::EVENT_TYPE_POINTER_UP: {
+ case mojo::EventType::POINTER_CANCEL:
+ case mojo::EventType::POINTER_MOVE:
+ case mojo::EventType::POINTER_UP: {
Pointer* pointer = GetPointerById(event.pointer_data->pointer_id);
// We delete a pointer when it has no gestures, so it's possible to get
// here with no gestures. Additionally there is no need to explicitly
« no previous file with comments | « services/view_manager/display_manager.cc ('k') | services/view_manager/gesture_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698