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

Unified Diff: ui/events/blink/web_input_event_unittest.cc

Issue 2252423002: Refactoring button field and its type (2nd try) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing Created 4 years, 4 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 | « ui/events/blink/web_input_event_traits.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/web_input_event_unittest.cc
diff --git a/ui/events/blink/web_input_event_unittest.cc b/ui/events/blink/web_input_event_unittest.cc
index bbbd5e14ad425e68ea83871f4f4b842ce8033157..4baaba192edaa3d8bb6fde1b7182fc3f202fd48b 100644
--- a/ui/events/blink/web_input_event_unittest.cc
+++ b/ui/events/blink/web_input_event_unittest.cc
@@ -256,7 +256,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -276,7 +276,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -296,7 +296,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonMiddle, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -316,7 +316,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonMiddle, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -336,7 +336,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonRight, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -356,7 +356,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonRight, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -375,7 +375,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -395,7 +395,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -415,7 +415,7 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type);
EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -484,7 +484,7 @@ TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
EXPECT_FLOAT_EQ(ui_event.x_offset() / 53.0f, webkit_event.wheelTicksX);
EXPECT_FLOAT_EQ(ui_event.y_offset() / 53.0f, webkit_event.wheelTicksY);
@@ -511,7 +511,7 @@ TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
webkit_event.timeStampSeconds);
- EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button);
+ EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
EXPECT_FLOAT_EQ(ui_event.y_offset() / 53.0f, webkit_event.wheelTicksX);
EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY);
« no previous file with comments | « ui/events/blink/web_input_event_traits.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698