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

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

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 years, 7 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
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 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 28 matching lines...) Expand all
39 // The name 'View' here meshes with OS X where the UI elements are called 39 // The name 'View' here meshes with OS X where the UI elements are called
40 // 'views' and with our Chrome UI code where the elements are also called 40 // 'views' and with our Chrome UI code where the elements are also called
41 // 'views'. 41 // 'views'.
42 42
43 #if defined(USE_AURA) 43 #if defined(USE_AURA)
44 namespace aura { 44 namespace aura {
45 class Window; 45 class Window;
46 } 46 }
47 namespace ui { 47 namespace ui {
48 class Cursor; 48 class Cursor;
49 enum class CursorType;
49 class Event; 50 class Event;
50 } 51 }
51 #endif // defined(USE_AURA) 52 #endif // defined(USE_AURA)
52 53
53 #if defined(OS_WIN) 54 #if defined(OS_WIN)
54 #include <windows.h> // NOLINT 55 #include <windows.h> // NOLINT
55 typedef struct HFONT__* HFONT; 56 typedef struct HFONT__* HFONT;
56 struct IAccessible; 57 struct IAccessible;
57 #elif defined(OS_IOS) 58 #elif defined(OS_IOS)
58 struct CGContext; 59 struct CGContext;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // Linux doesn't have a native font type. 150 // Linux doesn't have a native font type.
150 #if defined(USE_X11) && !defined(OS_CHROMEOS) 151 #if defined(USE_X11) && !defined(OS_CHROMEOS)
151 typedef AtkObject* NativeViewAccessible; 152 typedef AtkObject* NativeViewAccessible;
152 #else 153 #else
153 typedef void* NativeViewAccessible; 154 typedef void* NativeViewAccessible;
154 #endif 155 #endif
155 #endif 156 #endif
156 157
157 // A constant value to indicate that gfx::NativeCursor refers to no cursor. 158 // A constant value to indicate that gfx::NativeCursor refers to no cursor.
158 #if defined(USE_AURA) 159 #if defined(USE_AURA)
159 const int kNullCursor = 0; 160 const ui::CursorType kNullCursor = static_cast<ui::CursorType>(0);
160 #else 161 #else
161 const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL); 162 const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL);
162 #endif 163 #endif
163 164
164 #if defined(OS_IOS) 165 #if defined(OS_IOS)
165 typedef UIImage NativeImageType; 166 typedef UIImage NativeImageType;
166 #elif defined(OS_MACOSX) 167 #elif defined(OS_MACOSX)
167 typedef NSImage NativeImageType; 168 typedef NSImage NativeImageType;
168 #else 169 #else
169 typedef SkBitmap NativeImageType; 170 typedef SkBitmap NativeImageType;
(...skipping 26 matching lines...) Expand all
196 #elif defined(USE_OZONE) 197 #elif defined(USE_OZONE)
197 typedef int32_t AcceleratedWidget; 198 typedef int32_t AcceleratedWidget;
198 constexpr AcceleratedWidget kNullAcceleratedWidget = 0; 199 constexpr AcceleratedWidget kNullAcceleratedWidget = 0;
199 #else 200 #else
200 #error unknown platform 201 #error unknown platform
201 #endif 202 #endif
202 203
203 } // namespace gfx 204 } // namespace gfx
204 205
205 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 206 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« no previous file with comments | « ui/base/cursor/ozone/cursor_data_factory_ozone.cc ('k') | ui/ozone/platform/x11/x11_cursor_factory_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698