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

Unified Diff: third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp

Issue 2227563003: Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix new instances 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
Index: third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
index f8a6dc50d3a2b32f5e7ac081d5e38c91a5ee2b6b..9c35a868abefa99f7ced46cde68dff5a25019f97 100644
--- a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
@@ -120,7 +120,7 @@ protected:
TEST_F(GetNavigationPolicyTest, LeftClick)
{
int modifiers = 0;
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = false;
EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -129,7 +129,7 @@ TEST_F(GetNavigationPolicyTest, LeftClick)
TEST_F(GetNavigationPolicyTest, LeftClickPopup)
{
int modifiers = 0;
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = true;
EXPECT_EQ(WebNavigationPolicyNewPopup,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -138,7 +138,7 @@ TEST_F(GetNavigationPolicyTest, LeftClickPopup)
TEST_F(GetNavigationPolicyTest, ShiftLeftClick)
{
int modifiers = WebInputEvent::ShiftKey;
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = false;
EXPECT_EQ(WebNavigationPolicyNewWindow,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -147,7 +147,7 @@ TEST_F(GetNavigationPolicyTest, ShiftLeftClick)
TEST_F(GetNavigationPolicyTest, ShiftLeftClickPopup)
{
int modifiers = WebInputEvent::ShiftKey;
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = true;
EXPECT_EQ(WebNavigationPolicyNewPopup,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -160,7 +160,7 @@ TEST_F(GetNavigationPolicyTest, ControlOrMetaLeftClick)
#else
int modifiers = WebInputEvent::ControlKey;
#endif
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = false;
EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -173,7 +173,7 @@ TEST_F(GetNavigationPolicyTest, ControlOrMetaLeftClickPopup)
#else
int modifiers = WebInputEvent::ControlKey;
#endif
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = true;
EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -187,7 +187,7 @@ TEST_F(GetNavigationPolicyTest, ControlOrMetaAndShiftLeftClick)
int modifiers = WebInputEvent::ControlKey;
#endif
modifiers |= WebInputEvent::ShiftKey;
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = false;
EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -201,7 +201,7 @@ TEST_F(GetNavigationPolicyTest, ControlOrMetaAndShiftLeftClickPopup)
int modifiers = WebInputEvent::ControlKey;
#endif
modifiers |= WebInputEvent::ShiftKey;
- WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Left;
bool asPopup = true;
EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
@@ -211,7 +211,7 @@ TEST_F(GetNavigationPolicyTest, MiddleClick)
{
int modifiers = 0;
bool asPopup = false;
- WebMouseEvent::Button button = WebMouseEvent::ButtonMiddle;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Middle;
EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
}
@@ -220,7 +220,7 @@ TEST_F(GetNavigationPolicyTest, MiddleClickPopup)
{
int modifiers = 0;
bool asPopup = true;
- WebMouseEvent::Button button = WebMouseEvent::ButtonMiddle;
+ WebMouseEvent::Button button = WebMouseEvent::Button::Middle;
EXPECT_EQ(WebNavigationPolicyNewBackgroundTab,
getNavigationPolicyWithMouseEvent(modifiers, button, asPopup));
}
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | third_party/WebKit/Source/web/tests/LinkSelectionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698