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

Unified Diff: services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 years, 8 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/ui/public/interfaces/cursor/cursor_struct_traits.cc ('k') | services/ui/ws/cursor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc
diff --git a/services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc b/services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc
index fa0d041782398e210ca32f6dc815a5bb18722afe..db2c6c4754af3d0c50399d3739ec4787635bf8f4 100644
--- a/services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc
+++ b/services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc
@@ -48,11 +48,12 @@ std::vector<SkBitmap> CreateTestCursorFrames(const gfx::Size& size,
// Tests numeric cursor ids.
TEST_F(CursorStructTraitsTest, TestBuiltIn) {
for (int i = 0; i < 43; ++i) {
- ui::CursorData input(i);
+ ui::CursorType type = static_cast<ui::CursorType>(i);
+ ui::CursorData input(type);
ui::CursorData output;
ASSERT_TRUE(EchoCursorData(input, &output));
- EXPECT_TRUE(output.IsType(i));
+ EXPECT_TRUE(output.IsType(type));
}
}
@@ -68,7 +69,7 @@ TEST_F(CursorStructTraitsTest, TestBitmapCursor) {
ui::CursorData output;
ASSERT_TRUE(EchoCursorData(input, &output));
- EXPECT_EQ(kCursorCustom, output.cursor_type());
+ EXPECT_EQ(CursorType::kCustom, output.cursor_type());
EXPECT_EQ(kScale, output.scale_factor());
EXPECT_EQ(kFrameDelay, output.frame_delay());
EXPECT_EQ(kHotspot, output.hotspot_in_pixels());
« no previous file with comments | « services/ui/public/interfaces/cursor/cursor_struct_traits.cc ('k') | services/ui/ws/cursor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698