Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / wm / core / native_cursor_manager.h

diff --git a/src/ui/wm/core/native_cursor_manager.h b/src/ui/wm/core/native_cursor_manager.h
index 68c9d46..de16ef8 100644 (file)
--- a/src/ui/wm/core/native_cursor_manager.h
+++ b/src/ui/wm/core/native_cursor_manager.h
@@ -6,8 +6,9 @@
 #define UI_WM_CORE_NATIVE_CURSOR_MANAGER_H_
 
 #include "base/strings/string16.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
-#include "ui/wm/core/wm_core_export.h"
+#include "ui/wm/wm_export.h"
 
 namespace gfx {
 class Display;
@@ -19,45 +20,40 @@ namespace wm {
 // requested changes to cursor state. When requested, implementer should tell
 // the CursorManager of any actual state changes performed through the
 // delegate.
-class WM_CORE_EXPORT NativeCursorManager {
+class WM_EXPORT NativeCursorManager {
  public:
   virtual ~NativeCursorManager() {}
 
   // A request to set the screen DPI. Can cause changes in the current cursor.
   virtual void SetDisplay(
       const gfx::Display& display,
-      wm::NativeCursorManagerDelegate* delegate) = 0;
+      NativeCursorManagerDelegate* delegate) = 0;
 
   // A request to set the cursor to |cursor|. At minimum, implementer should
   // call NativeCursorManagerDelegate::CommitCursor() with whatever cursor is
   // actually used.
   virtual void SetCursor(
       gfx::NativeCursor cursor,
-      wm::NativeCursorManagerDelegate* delegate) = 0;
+      NativeCursorManagerDelegate* delegate) = 0;
 
   // A request to set the visibility of the cursor. At minimum, implementer
   // should call NativeCursorManagerDelegate::CommitVisibility() with whatever
   // the visibility is.
   virtual void SetVisibility(
     bool visible,
-    wm::NativeCursorManagerDelegate* delegate) = 0;
+    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;
+      NativeCursorManagerDelegate* delegate) = 0;
 
   // A request to set whether mouse events are disabled. At minimum,
   // implementer should call NativeCursorManagerDelegate::
   // CommitMouseEventsEnabled() with whether mouse events are actually enabled.
   virtual void SetMouseEventsEnabled(
       bool enabled,
-      wm::NativeCursorManagerDelegate* delegate) = 0;
+      NativeCursorManagerDelegate* delegate) = 0;
 };
 
 }  // namespace wm