Cursor state should be global for all CursorManagers

ui/aura/test/test_cursor_client.cc

 // Copyright 2013 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 "ui/aura/test/test_cursor_client.h"
 
 #include "ui/aura/client/cursor_client_observer.h"
 
 namespace aura {
 namespace test {
 
 TestCursorClient::TestCursorClient(aura::Window* root_window)
     : visible_(true),
       mouse_events_enabled_(true),
       cursor_lock_count_(0),
       root_window_(root_window) {
   client::SetCursorClient(root_window, this);
 }
 
 TestCursorClient::~TestCursorClient() {
   client::SetCursorClient(root_window_, NULL);
 }
 
 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_,
                     OnCursorVisibilityChanged(true));
 }
 
 void TestCursorClient::HideCursor() {
   visible_ = false;
   FOR_EACH_OBSERVER(aura::client::CursorClientObserver, observers_,
                     OnCursorVisibilityChanged(false));
 }
 
 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_;
 }
 
 void TestCursorClient::EnableMouseEvents() {
   mouse_events_enabled_ = true;
 }
 
 void TestCursorClient::DisableMouseEvents() {
   mouse_events_enabled_ = false;
@@ skipping 25 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void TestCursorClient::RemoveObserver(
     aura::client::CursorClientObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace test
 }  // namespace aura