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

Unified Diff: ui/views/controls/button/custom_button_unittest.cc

Issue 2611773002: Removes code using mus client lib (Closed)
Patch Set: dont run on linux Created 3 years, 12 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/views/accessible_pane_view_unittest.cc ('k') | ui/views/controls/button/menu_button_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/custom_button_unittest.cc
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index 889bc7beb6c5884dacba696d5cebb56f0433c80d..7c6184812d8e9348dd1ee2dd04219d6f463ff018 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -221,24 +221,21 @@ TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
aura::test::TestCursorClient cursor_client(
widget()->GetNativeView()->GetRootWindow());
- // Mus doesn't support disabling mouse events. https://crbug.com/618321
- if (!IsMus()) {
- // In Aura views, no new hover effects are invoked if mouse events
- // are disabled.
- cursor_client.DisableMouseEvents();
+ // In Aura views, no new hover effects are invoked if mouse events
+ // are disabled.
+ cursor_client.DisableMouseEvents();
- button()->SetEnabled(false);
- EXPECT_EQ(CustomButton::STATE_DISABLED, button()->state());
+ button()->SetEnabled(false);
+ EXPECT_EQ(CustomButton::STATE_DISABLED, button()->state());
- button()->SetEnabled(true);
- EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
+ button()->SetEnabled(true);
+ EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
- button()->SetVisible(false);
- EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
+ button()->SetVisible(false);
+ EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
- button()->SetVisible(true);
- EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
- }
+ button()->SetVisible(true);
+ EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
#endif // !defined(OS_MACOSX) || defined(USE_AURA)
}
« no previous file with comments | « ui/views/accessible_pane_view_unittest.cc ('k') | ui/views/controls/button/menu_button_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698