| 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 WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ | 5 #ifndef WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ |
| 6 #define WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ | 6 #define WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "third_party/WebKit/public/web/WebCursorInfo.h" | 9 #include "third_party/WebKit/public/web/WebCursorInfo.h" |
| 10 #include "ui/gfx/display.h" | 10 #include "ui/gfx/display.h" |
| 11 #include "ui/gfx/native_widget_types.h" | 11 #include "ui/gfx/native_widget_types.h" |
| 12 #include "ui/gfx/point.h" | 12 #include "ui/gfx/point.h" |
| 13 #include "ui/gfx/size.h" | 13 #include "ui/gfx/size.h" |
| 14 #include "webkit/common/webkit_common_export.h" | 14 #include "webkit/common/webkit_common_export.h" |
| 15 | 15 |
| 16 #include <vector> | 16 #include <vector> |
| 17 | 17 |
| 18 #if defined(USE_AURA) |
| 19 #include "ui/base/cursor/cursor.h" |
| 20 #endif |
| 21 |
| 18 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
| 19 typedef struct HINSTANCE__* HINSTANCE; | 23 typedef struct HINSTANCE__* HINSTANCE; |
| 20 typedef struct HICON__* HICON; | 24 typedef struct HICON__* HICON; |
| 21 typedef HICON HCURSOR; | 25 typedef HICON HCURSOR; |
| 22 #elif defined(TOOLKIT_GTK) | 26 #elif defined(TOOLKIT_GTK) |
| 23 typedef struct _GdkCursor GdkCursor; | 27 typedef struct _GdkCursor GdkCursor; |
| 24 #elif defined(OS_MACOSX) | 28 #elif defined(OS_MACOSX) |
| 25 #ifdef __OBJC__ | 29 #ifdef __OBJC__ |
| 26 @class NSCursor; | 30 @class NSCursor; |
| 27 #else | 31 #else |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 #elif defined(OS_WIN) | 186 #elif defined(OS_WIN) |
| 183 // A custom cursor created from custom bitmap data by Webkit. | 187 // A custom cursor created from custom bitmap data by Webkit. |
| 184 HCURSOR custom_cursor_; | 188 HCURSOR custom_cursor_; |
| 185 #elif defined(TOOLKIT_GTK) | 189 #elif defined(TOOLKIT_GTK) |
| 186 // A custom cursor created that should be unref'ed from the destructor. | 190 // A custom cursor created that should be unref'ed from the destructor. |
| 187 GdkCursor* unref_; | 191 GdkCursor* unref_; |
| 188 #endif | 192 #endif |
| 189 }; | 193 }; |
| 190 | 194 |
| 191 #endif // WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ | 195 #endif // WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ |
| OLD | NEW |