Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: ui/gfx/native_widget_types.h

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_GFX_NATIVE_WIDGET_TYPES_H_ 5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_ 6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 25 matching lines...) Expand all
36 // specific typedef. 36 // specific typedef.
37 // 37 //
38 // NativeImage: The platform-specific image type used for drawing UI elements 38 // NativeImage: The platform-specific image type used for drawing UI elements
39 // in the browser. 39 // in the browser.
40 // 40 //
41 // The name 'View' here meshes with OS X where the UI elements are called 41 // The name 'View' here meshes with OS X where the UI elements are called
42 // 'views' and with our Chrome UI code where the elements are also called 42 // 'views' and with our Chrome UI code where the elements are also called
43 // 'views'. 43 // 'views'.
44 44
45 #if defined(USE_AURA) 45 #if defined(USE_AURA)
46 #include "ui/aura/cursor.h"
47
46 class SkRegion; 48 class SkRegion;
47 namespace aura { 49 namespace aura {
48 class Event; 50 class Event;
49 class Window; 51 class Window;
50 } 52 }
51 #endif // defined(USE_AURA) 53 #endif // defined(USE_AURA)
52 54
53 #if defined(OS_WIN) 55 #if defined(OS_WIN)
54 #include <windows.h> // NOLINT 56 #include <windows.h> // NOLINT
55 typedef struct HFONT__* HFONT; 57 typedef struct HFONT__* HFONT;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #elif defined(OS_ANDROID) 99 #elif defined(OS_ANDROID)
98 class ChromeView; 100 class ChromeView;
99 #endif 101 #endif
100 class SkBitmap; 102 class SkBitmap;
101 103
102 class AcceleratedSurface; 104 class AcceleratedSurface;
103 105
104 namespace gfx { 106 namespace gfx {
105 107
106 #if defined(USE_AURA) 108 #if defined(USE_AURA)
107 // See ui/aura/cursor.h for values. 109 typedef aura::Cursor NativeCursor;
108 typedef int NativeCursor;
109 typedef aura::Window* NativeView; 110 typedef aura::Window* NativeView;
110 typedef aura::Window* NativeWindow; 111 typedef aura::Window* NativeWindow;
111 typedef SkRegion* NativeRegion; 112 typedef SkRegion* NativeRegion;
112 typedef aura::Event* NativeEvent; 113 typedef aura::Event* NativeEvent;
113 #elif defined(OS_WIN) 114 #elif defined(OS_WIN)
114 typedef HCURSOR NativeCursor; 115 typedef HCURSOR NativeCursor;
115 typedef HWND NativeView; 116 typedef HWND NativeView;
116 typedef HWND NativeWindow; 117 typedef HWND NativeWindow;
117 typedef HRGN NativeRegion; 118 typedef HRGN NativeRegion;
118 typedef MSG NativeEvent; 119 typedef MSG NativeEvent;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 typedef void* NativeViewAccessible; 176 typedef void* NativeViewAccessible;
176 #elif defined(OS_ANDROID) 177 #elif defined(OS_ANDROID)
177 typedef void* NativeFont; 178 typedef void* NativeFont;
178 typedef void* NativeEditView; 179 typedef void* NativeEditView;
179 typedef void* NativeDrawingContext; 180 typedef void* NativeDrawingContext;
180 typedef void* NativeMenu; 181 typedef void* NativeMenu;
181 typedef void* NativeViewAccessible; 182 typedef void* NativeViewAccessible;
182 #endif 183 #endif
183 184
184 // A constant value to indicate that gfx::NativeCursor refers to no cursor. 185 // A constant value to indicate that gfx::NativeCursor refers to no cursor.
186 #if defined(USE_AURA)
187 const int kNullCursor = 0;
188 #else
185 const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL); 189 const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL);
190 #endif
186 191
187 #if defined(OS_MACOSX) 192 #if defined(OS_MACOSX)
188 typedef NSImage NativeImageType; 193 typedef NSImage NativeImageType;
189 #elif defined(TOOLKIT_GTK) 194 #elif defined(TOOLKIT_GTK)
190 typedef GdkPixbuf NativeImageType; 195 typedef GdkPixbuf NativeImageType;
191 #else 196 #else
192 typedef SkBitmap NativeImageType; 197 typedef SkBitmap NativeImageType;
193 #endif 198 #endif
194 typedef NativeImageType* NativeImage; 199 typedef NativeImageType* NativeImage;
195 200
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 #elif defined(OS_ANDROID) 312 #elif defined(OS_ANDROID)
308 typedef uint64 AcceleratedWidget; 313 typedef uint64 AcceleratedWidget;
309 const AcceleratedWidget kNullAcceleratedWidget = 0; 314 const AcceleratedWidget kNullAcceleratedWidget = 0;
310 #else 315 #else
311 #error unknown platform 316 #error unknown platform
312 #endif 317 #endif
313 318
314 } // namespace gfx 319 } // namespace gfx
315 320
316 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 321 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« ui/aura/cursor.h ('K') | « ui/base/x/x11_util.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698