| 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 #ifndef UI_BASE_CURSOR_CURSOR_H_ | 5 #ifndef UI_BASE_CURSOR_CURSOR_H_ |
| 6 #define UI_BASE_CURSOR_CURSOR_H_ | 6 #define UI_BASE_CURSOR_CURSOR_H_ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "ui/base/ui_base_export.h" | 9 #include "ui/base/ui_base_export.h" |
| 10 | 10 |
| 11 namespace gfx { | 11 namespace gfx { |
| 12 class Point; | 12 class Point; |
| 13 class Size; | 13 class Size; |
| 14 } | 14 } |
| 15 | 15 |
| 16 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
| 17 typedef struct HINSTANCE__* HINSTANCE; | 17 typedef struct HINSTANCE__* HINSTANCE; |
| 18 typedef struct HICON__* HICON; | 18 typedef struct HICON__* HICON; |
| 19 typedef HICON HCURSOR; | 19 typedef HICON HCURSOR; |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 #if defined(USE_OZONE) |
| 23 class SkBitmap; |
| 24 #endif |
| 25 |
| 22 namespace ui { | 26 namespace ui { |
| 23 | 27 |
| 24 #if defined(OS_WIN) | 28 #if defined(OS_WIN) |
| 25 typedef ::HCURSOR PlatformCursor; | 29 typedef ::HCURSOR PlatformCursor; |
| 26 #elif defined(USE_X11) | 30 #elif defined(USE_X11) |
| 27 typedef unsigned long PlatformCursor; | 31 typedef unsigned long PlatformCursor; |
| 32 #elif defined(USE_OZONE) |
| 33 typedef SkBitmap* PlatformCursor; |
| 28 #else | 34 #else |
| 29 typedef void* PlatformCursor; | 35 typedef void* PlatformCursor; |
| 30 #endif | 36 #endif |
| 31 | 37 |
| 32 // TODO(jamescook): Once we're on C++0x we could change these constants | 38 // TODO(jamescook): Once we're on C++0x we could change these constants |
| 33 // to an enum and forward declare it in native_widget_types.h. | 39 // to an enum and forward declare it in native_widget_types.h. |
| 34 | 40 |
| 35 // Equivalent to a NULL HCURSOR on Windows. | 41 // Equivalent to a NULL HCURSOR on Windows. |
| 36 const int kCursorNull = 0; | 42 const int kCursorNull = 0; |
| 37 | 43 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 145 |
| 140 PlatformCursor platform_cursor_; | 146 PlatformCursor platform_cursor_; |
| 141 | 147 |
| 142 // The device scale factor for the cursor. | 148 // The device scale factor for the cursor. |
| 143 float device_scale_factor_; | 149 float device_scale_factor_; |
| 144 }; | 150 }; |
| 145 | 151 |
| 146 } // namespace ui | 152 } // namespace ui |
| 147 | 153 |
| 148 #endif // UI_BASE_CURSOR_CURSOR_H_ | 154 #endif // UI_BASE_CURSOR_CURSOR_H_ |
| OLD | NEW |