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

Unified Diff: ui/gfx/native_widget_types.h

Issue 2739783002: MacViews/a11y: Typedef gfx::NativeViewAccessible to id for all of Mac & iOS. (Closed)
Patch Set: Review comments. Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/platform_test.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index 44e1d2611c6a277e88153204394b6c64364d2a1b..e2bb463602f8065019dae08a8797d011c5f0e4b3 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -12,6 +12,8 @@
#if defined(OS_ANDROID)
#include <jni.h>
+#elif defined(OS_MACOSX)
+#include <objc/objc.h>
#endif
// This file provides cross platform typedefs for native widget types.
@@ -139,18 +141,10 @@ typedef HFONT NativeFont;
typedef IAccessible* NativeViewAccessible;
#elif defined(OS_IOS)
typedef UIFont* NativeFont;
-#ifdef __OBJC__
typedef id NativeViewAccessible;
-#else
-typedef void* NativeViewAccessible;
-#endif // __OBJC__
#elif defined(OS_MACOSX)
typedef NSFont* NativeFont;
-#ifdef __OBJC__
typedef id NativeViewAccessible;
-#else
-typedef void* NativeViewAccessible;
-#endif // __OBJC__
#else // Android, Linux, Chrome OS, etc.
// Linux doesn't have a native font type.
#if defined(USE_X11) && !defined(OS_CHROMEOS)
« no previous file with comments | « testing/platform_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698