mus: Let clients set the cursor of their window.

components/mus/ws/window_tree_apptest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
@@ skipping 230 matching lines @@
                          const std::string& name,
                          const std::vector<uint8_t>* data) {
     Array<uint8_t> mojo_data;
     if (data)
       mojo_data = Array<uint8_t>::From(*data);
     const uint32_t change_id = GetAndAdvanceChangeId();
     tree()->SetWindowProperty(change_id, window_id, name, mojo_data.Pass());
     return WaitForChangeCompleted(change_id);
   }
 
+  bool SetPredefinedCursor(Id window_id, mojom::Cursor cursor) {
+    const uint32_t change_id = GetAndAdvanceChangeId();
+    tree()->SetPredefinedCursor(change_id, window_id, cursor);
+    return WaitForChangeCompleted(change_id);
+  }
+
   bool SetWindowVisibility(Id window_id, bool visible) {
     const uint32_t change_id = GetAndAdvanceChangeId();
     tree()->SetWindowVisibility(change_id, window_id, visible);
     return WaitForChangeCompleted(change_id);
   }
 
  private:
   // Used when running a nested MessageLoop.
   struct WaitState {
     WaitState() : change_count(0) {}
@@ skipping 82 matching lines @@
     // Don't log input events as none of the tests care about them and they
     // may come in at random points.
   }
   void OnWindowSharedPropertyChanged(uint32_t window,
                                      const String& name,
                                      Array<uint8_t> new_data) override {
     tracker_.OnWindowSharedPropertyChanged(window, name, new_data.Pass());
   }
   // TODO(sky): add testing coverage.
   void OnWindowFocused(uint32_t focused_window_id) override {}
+  void OnWindowPredefinedCursorChanged(uint32 window_id,
+                                       mojom::Cursor cursor_id) override {
+    tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id);
+  }
   void OnChangeCompleted(uint32_t change_id, bool success) override {
     if (waiting_change_id_ == change_id && change_completed_run_loop_) {
       on_change_completed_result_ = success;
       change_completed_run_loop_->Quit();
     }
   }
   void WmSetBounds(uint32_t change_id,
                    Id window_id,
                    mojo::RectPtr bounds) override {}
   void WmSetProperty(uint32_t change_id,
@@ skipping 1042 matching lines @@
     ASSERT_EQ(2u, windows.size());
     EXPECT_EQ(WindowParentToString(window_1_1, root_window_id()) +
                   " visible=true drawn=true",
               windows[0].ToString2());
     EXPECT_EQ(WindowParentToString(window_1_2, window_1_1) +
                   " visible=true drawn=true",
               windows[1].ToString2());
   }
 }
 
+// Test that we hear the cursor change in other connections.
+TEST_F(WindowTreeAppTest, SetCursor) {
+  // Get a second connection to listen in.
+  ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
+  Id window_1_1 = BuildWindowId(connection_id_1(), 1);
+  changes2()->clear();
+
+  ASSERT_TRUE(ws_client1()->SetPredefinedCursor(window_1_1,
+                                                mojom::Cursor::CURSOR_IBEAM));
+  ws_client2_->WaitForChangeCount(1u);
+
+  EXPECT_EQ("CursorChanged id=" + IdToString(window_1_1) + " cursor_id=4",
+            SingleChangeToDescription(*changes2()));
+}
+
 // Assertions for SetWindowVisibility sending notifications.
 TEST_F(WindowTreeAppTest, SetWindowVisibilityNotifications) {
   // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
   Id window_1_1 = ws_client1()->NewWindow(1);
   ASSERT_TRUE(window_1_1);
   ASSERT_TRUE(ws_client1()->SetWindowVisibility(window_1_1, true));
   Id window_1_2 = ws_client1()->NewWindow(2);
   ASSERT_TRUE(window_1_2);
   ASSERT_TRUE(ws_client1()->SetWindowVisibility(window_1_2, true));
   ASSERT_TRUE(AddWindow(ws1(), root_window_id(), window_1_1));
@@ skipping 331 matching lines @@
 // originating connection.
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace ws
 }  // namespace mus