Cursor state should be global for all CursorManagers

ui/aura/test/test_cursor_client.cc

Index: ui/aura/test/test_cursor_client.cc
diff --git a/ui/aura/test/test_cursor_client.cc b/ui/aura/test/test_cursor_client.cc
index edf8ca071346ec0d6717835f22f9bf3f72d20bda..d34976851309788377aed524ab824b5095097273 100644
--- a/ui/aura/test/test_cursor_client.cc
+++ b/ui/aura/test/test_cursor_client.cc
@@ -24,6 +24,10 @@ TestCursorClient::~TestCursorClient() {
 void TestCursorClient::SetCursor(gfx::NativeCursor cursor) {
 }
 
+gfx::NativeCursor TestCursorClient::GetCursor() const {
+  return ui::kCursorNull;
+}
+
 void TestCursorClient::ShowCursor() {
   visible_ = true;
   FOR_EACH_OBSERVER(aura::client::CursorClientObserver, observers_,
@@ -39,9 +43,17 @@ void TestCursorClient::HideCursor() {
 void TestCursorClient::SetCursorSet(ui::CursorSetType cursor_set) {
 }
 
+ui::CursorSetType TestCursorClient::GetCursorSet() const {
+  return ui::CURSOR_SET_NORMAL;
+}
+
 void TestCursorClient::SetScale(float scale) {
 }
 
+float TestCursorClient::GetScale() const {
+  return 0.f;

[sky, 2013/12/05 01:32:43]

Don't we want 1 here?

[tdanderson, 2013/12/05 23:07:41]

Done.

+}
+
 bool TestCursorClient::IsCursorVisible() const {
   return visible_;
 }