9 files changed, 1 insertions, 55 deletions
diff --git a/ui/aura/client/cursor_client.h b/ui/aura/client/cursor_client.h
index 8f2872e..fc48e03 100644
--- a/ui/aura/client/cursor_client.h
+++ b/ui/aura/client/cursor_client.h
@@ -39,12 +39,6 @@ class AURA_EXPORT CursorClient {
   // invisible.
   virtual void HideCursor() = 0;
 
-  // Sets the scale of the mouse cursor icon.
-  virtual void SetScale(float scale) = 0;
-
-  // Gets the current scale of the mouse cursor icon.
-  virtual float GetScale() const = 0;
-
   // Sets the type of the mouse cursor icon.
   virtual void SetCursorSet(ui::CursorSetType cursor_set) = 0;
 
diff --git a/ui/aura/test/test_cursor_client.cc b/ui/aura/test/test_cursor_client.cc
index 5662555..21f77cc 100644
--- a/ui/aura/test/test_cursor_client.cc
+++ b/ui/aura/test/test_cursor_client.cc
@@ -49,13 +49,6 @@ ui::CursorSetType TestCursorClient::GetCursorSet() const {
   return ui::CURSOR_SET_NORMAL;
 }
 
-void TestCursorClient::SetScale(float scale) {
-}
-
-float TestCursorClient::GetScale() const {
-  return 1.f;
-}
-
 bool TestCursorClient::IsCursorVisible() const {
   return visible_;
 }
diff --git a/ui/aura/test/test_cursor_client.h b/ui/aura/test/test_cursor_client.h
index 10452f1..089827d 100644
--- a/ui/aura/test/test_cursor_client.h
+++ b/ui/aura/test/test_cursor_client.h
@@ -33,8 +33,6 @@ class TestCursorClient : public aura::client::CursorClient {
   virtual void HideCursor() OVERRIDE;
   virtual void SetCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
   virtual ui::CursorSetType GetCursorSet() const OVERRIDE;
-  virtual void SetScale(float scale) OVERRIDE;
-  virtual float GetScale() const OVERRIDE;
   virtual bool IsCursorVisible() const OVERRIDE;
   virtual void EnableMouseEvents() OVERRIDE;
   virtual void DisableMouseEvents() OVERRIDE;
diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc
index 8225e00..ec898fb 100644
--- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc
@@ -85,12 +85,6 @@ void DesktopNativeCursorManager::SetCursorSet(
   NOTIMPLEMENTED();
 }
 
-void DesktopNativeCursorManager::SetScale(
-    float scale,
-    wm::NativeCursorManagerDelegate* delegate) {
-  NOTIMPLEMENTED();
-}
-
 void DesktopNativeCursorManager::SetMouseEventsEnabled(
     bool enabled,
     wm::NativeCursorManagerDelegate* delegate) {
diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
index d917af4..ee15634 100644
--- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
+++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
@@ -60,9 +60,6 @@ class VIEWS_EXPORT DesktopNativeCursorManager
   virtual void SetCursorSet(
       ui::CursorSetType cursor_set,
       wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
-  virtual void SetScale(
-      float scale,
-      wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
   virtual void SetMouseEventsEnabled(
       bool enabled,
       wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
diff --git a/ui/wm/core/cursor_manager.cc b/ui/wm/core/cursor_manager.cc
index 736ef6f..e9f9885 100644
--- a/ui/wm/core/cursor_manager.cc
+++ b/ui/wm/core/cursor_manager.cc
@@ -21,7 +21,6 @@ class CursorState {
   CursorState()
       : cursor_(ui::kCursorNone),
         visible_(true),
-        scale_(1.f),
         cursor_set_(ui::CURSOR_SET_NORMAL),
         mouse_events_enabled_(true),
         visible_on_mouse_events_enabled_(true) {
@@ -37,11 +36,6 @@ class CursorState {
     // Ignores the call when mouse events disabled.
   }
 
-  float scale() const { return scale_; }
-  void set_scale(float scale) {
-    scale_ = scale;
-  }
-
   ui::CursorSetType cursor_set() const { return cursor_set_; }
   void set_cursor_set(ui::CursorSetType cursor_set) {
     cursor_set_ = cursor_set;
@@ -65,7 +59,6 @@ class CursorState {
  private:
   gfx::NativeCursor cursor_;
   bool visible_;
-  float scale_;
   ui::CursorSetType cursor_set_;
   bool mouse_events_enabled_;
 
@@ -123,16 +116,6 @@ bool CursorManager::IsCursorVisible() const {
   return current_state_->visible();
 }
 
-void CursorManager::SetScale(float scale) {
-  state_on_unlock_->set_scale(scale);
-  if (GetScale() != state_on_unlock_->scale())
-    delegate_->SetScale(state_on_unlock_->scale(), this);
-}
-
-float CursorManager::GetScale() const {
-  return current_state_->scale();
-}
-
 void CursorManager::SetCursorSet(ui::CursorSetType cursor_set) {
   state_on_unlock_->set_cursor_set(cursor_set);
   if (GetCursorSet() != state_on_unlock_->cursor_set())
@@ -223,10 +206,6 @@ void CursorManager::CommitVisibility(bool visible) {
   current_state_->SetVisible(visible);
 }
 
-void CursorManager::CommitScale(float scale) {
-  current_state_->set_scale(scale);
-}
-
 void CursorManager::CommitCursorSet(ui::CursorSetType cursor_set) {
   current_state_->set_cursor_set(cursor_set);
 }
diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h
index a6b226e..0fe25f7 100644
--- a/ui/wm/core/cursor_manager.h
+++ b/ui/wm/core/cursor_manager.h
@@ -48,8 +48,6 @@ class WM_CORE_EXPORT CursorManager : public aura::client::CursorClient,
   virtual void ShowCursor() OVERRIDE;
   virtual void HideCursor() OVERRIDE;
   virtual bool IsCursorVisible() const OVERRIDE;
-  virtual void SetScale(float scale) OVERRIDE;
-  virtual float GetScale() const OVERRIDE;
   virtual void SetCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
   virtual ui::CursorSetType GetCursorSet() const OVERRIDE;
   virtual void EnableMouseEvents() OVERRIDE;
@@ -70,7 +68,6 @@ class WM_CORE_EXPORT CursorManager : public aura::client::CursorClient,
   // Overridden from NativeCursorManagerDelegate:
   virtual void CommitCursor(gfx::NativeCursor cursor) OVERRIDE;
   virtual void CommitVisibility(bool visible) OVERRIDE;
-  virtual void CommitScale(float scale) OVERRIDE;
   virtual void CommitCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
   virtual void CommitMouseEventsEnabled(bool enabled) OVERRIDE;
 
diff --git a/ui/wm/core/native_cursor_manager.h b/ui/wm/core/native_cursor_manager.h
index 68c9d46..6697728 100644
--- a/ui/wm/core/native_cursor_manager.h
+++ b/ui/wm/core/native_cursor_manager.h
@@ -42,12 +42,7 @@ class WM_CORE_EXPORT NativeCursorManager {
     bool visible,
     wm::NativeCursorManagerDelegate* delegate) = 0;
 
-  // A request to set the scale of the cursor icon.
-  virtual void SetScale(
-      float scale,
-      wm::NativeCursorManagerDelegate* delegate) = 0;
-
-  // A request to set the scale of the cursor icon.
+  // A request to set the cursor set.
   virtual void SetCursorSet(
       ui::CursorSetType cursor_set,
       wm::NativeCursorManagerDelegate* delegate) = 0;
diff --git a/ui/wm/core/native_cursor_manager_delegate.h b/ui/wm/core/native_cursor_manager_delegate.h
index 0571d57..aad9825 100644
--- a/ui/wm/core/native_cursor_manager_delegate.h
+++ b/ui/wm/core/native_cursor_manager_delegate.h
@@ -24,7 +24,6 @@ class WM_CORE_EXPORT NativeCursorManagerDelegate {
 
   virtual void CommitCursor(gfx::NativeCursor cursor) = 0;
   virtual void CommitVisibility(bool visible) = 0;
-  virtual void CommitScale(float scale) = 0;
   virtual void CommitCursorSet(ui::CursorSetType cursor_set) = 0;
   virtual void CommitMouseEventsEnabled(bool enabled) = 0;
 };