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

Side by Side Diff: services/ui/ws/window_tree_client_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, 7 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 unified diff | Download patch
« no previous file with comments | « services/ui/ws/window_manager_state_unittest.cc ('k') | services/ui/ws/window_tree_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 } 1632 }
1633 1633
1634 // Test that we hear the cursor change in other clients. 1634 // Test that we hear the cursor change in other clients.
1635 TEST_F(WindowTreeClientTest, SetCursor) { 1635 TEST_F(WindowTreeClientTest, SetCursor) {
1636 // Get a second client to listen in. 1636 // Get a second client to listen in.
1637 ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); 1637 ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
1638 Id window_1_1 = BuildWindowId(client_id_1(), 1); 1638 Id window_1_1 = BuildWindowId(client_id_1(), 1);
1639 changes2()->clear(); 1639 changes2()->clear();
1640 1640
1641 ASSERT_TRUE( 1641 ASSERT_TRUE(
1642 wt_client1()->SetPredefinedCursor(window_1_1, mojom::CursorType::IBEAM)); 1642 wt_client1()->SetPredefinedCursor(window_1_1, mojom::CursorType::kIBeam));
1643 wt_client2_->WaitForChangeCount(1u); 1643 wt_client2_->WaitForChangeCount(1u);
1644 1644
1645 EXPECT_EQ("CursorChanged id=" + IdToString(window_1_1) + " cursor_id=4", 1645 EXPECT_EQ("CursorChanged id=" + IdToString(window_1_1) + " cursor_id=4",
1646 SingleChangeToDescription(*changes2())); 1646 SingleChangeToDescription(*changes2()));
1647 } 1647 }
1648 1648
1649 // Assertions for SetWindowVisibility sending notifications. 1649 // Assertions for SetWindowVisibility sending notifications.
1650 TEST_F(WindowTreeClientTest, SetWindowVisibilityNotifications) { 1650 TEST_F(WindowTreeClientTest, SetWindowVisibilityNotifications) {
1651 // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root. 1651 // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
1652 Id window_1_1 = wt_client1()->NewWindow(1); 1652 Id window_1_1 = wt_client1()->NewWindow(1);
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2269 2269
2270 // TODO(sky): make sure coverage of what was 2270 // TODO(sky): make sure coverage of what was
2271 // WindowManagerTest.SecondEmbedRoot_InitService and 2271 // WindowManagerTest.SecondEmbedRoot_InitService and
2272 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window 2272 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
2273 // manager 2273 // manager
2274 // tests. 2274 // tests.
2275 2275
2276 } // namespace test 2276 } // namespace test
2277 } // namespace ws 2277 } // namespace ws
2278 } // namespace ui 2278 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_manager_state_unittest.cc ('k') | services/ui/ws/window_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698