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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/web_input_event_aura_unittest.cc

Issue 2227563003: Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac/win errors 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 | « content/browser/renderer_host/web_input_event_aura.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | third_party/WebKit/Source/core/events/PointerEventFactory.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/web_input_event_aura_unittest.cc
diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc
index 63143f6767cade0630d66efc7607c182ee5a670a..663a03174ee66fd2d3ebf38a2c398fb55aba7c3e 100644
--- a/content/browser/renderer_host/web_input_event_aura_unittest.cc
+++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc
@@ -263,7 +263,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -282,7 +282,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -301,7 +301,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -320,7 +320,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -339,7 +339,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -358,7 +358,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -376,7 +376,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -395,7 +395,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -415,7 +415,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.GetClickCount(), webkit_event.clickCount);
EXPECT_EQ(123, webkit_event.x);
@@ -481,7 +481,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseWheelEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.x_offset() / 53.0f, webkit_event.wheelTicksX);
EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksY);
@@ -507,7 +507,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseWheelEvent) {
webkit_event.modifiers);
EXPECT_FLOAT_EQ(ui::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(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksX);
EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY);
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | third_party/WebKit/Source/core/events/PointerEventFactory.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698