1 files changed, 10 insertions, 12 deletions
diff --git a/chromium/ui/base/cursor/cursor_loader.h b/chromium/ui/base/cursor/cursor_loader.h
index d54d2989127..d4a0c3d2da0 100644
--- a/chromium/ui/base/cursor/cursor_loader.h
+++ b/chromium/ui/base/cursor/cursor_loader.h
@@ -7,26 +7,24 @@
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
 
-class UI_EXPORT CursorLoader {
+class UI_BASE_EXPORT CursorLoader {
  public:
-  CursorLoader() : scale_(1.f) {}
+  CursorLoader() : scale_(1.f), rotation_(gfx::Display::ROTATE_0) {}
   virtual ~CursorLoader() {}
 
-  // Returns the display the loader loads images for.
-  const gfx::Display& display() const {
-    return display_;
+  gfx::Display::Rotation rotation() const {
+    return rotation_;
   }
 
-  // Sets the display the loader loads images for.
-  void set_display(const gfx::Display& display) {
-    display_ = display;
+  void set_rotation(gfx::Display::Rotation rotation) {
+    rotation_ = rotation;
   }
 
   // Returns the current scale of the mouse cursor icon.
@@ -64,12 +62,12 @@ class UI_EXPORT CursorLoader {
   static CursorLoader* Create();
 
  private:
-  // The display the loader loads images for.
-  gfx::Display display_;
-
   // The current scale of the mouse cursor icon.
   float scale_;
 
+  // The current rotation of the mouse cursor icon.
+  gfx::Display::Rotation rotation_;
+
   DISALLOW_COPY_AND_ASSIGN(CursorLoader);
 };