| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/image_cursors.h" | 5 #include "ash/wm/image_cursors.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ui/base/cursor/cursor_loader.h" | 8 #include "ui/base/cursor/cursor_loader.h" |
| 9 #include "ui/base/cursor/cursor.h" | 9 #include "ui/base/cursor/cursor.h" |
| 10 #include "ui/gfx/point.h" | 10 #include "ui/gfx/point.h" |
| 11 #include "grit/ash_resources.h" |
| 11 #include "grit/ui_resources.h" | 12 #include "grit/ui_resources.h" |
| 12 | 13 |
| 13 namespace { | 14 namespace { |
| 14 | 15 |
| 15 const int kAnimatedCursorFrameDelayMs = 25; | 16 const int kAnimatedCursorFrameDelayMs = 25; |
| 16 | 17 |
| 17 struct HotPoint { | 18 struct HotPoint { |
| 18 int x; | 19 int x; |
| 19 int y; | 20 int y; |
| 20 }; | 21 }; |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 gfx::Point(hot.x, hot.y), | 115 gfx::Point(hot.x, hot.y), |
| 115 kAnimatedCursorFrameDelayMs); | 116 kAnimatedCursorFrameDelayMs); |
| 116 } | 117 } |
| 117 } | 118 } |
| 118 | 119 |
| 119 void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) { | 120 void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) { |
| 120 cursor_loader_->SetPlatformCursor(cursor); | 121 cursor_loader_->SetPlatformCursor(cursor); |
| 121 } | 122 } |
| 122 | 123 |
| 123 } // namespace ash | 124 } // namespace ash |
| OLD | NEW |