Index: ui/gfx/native_widget_types.h |
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h |
index 70c6e493c510129a9032bc23a54d2a98fdbaa754..1f40cc2e5320110ae44acfe20694111529100382 100644 |
--- a/ui/gfx/native_widget_types.h |
+++ b/ui/gfx/native_widget_types.h |
@@ -226,6 +226,11 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) { |
#elif defined(USE_X11) |
typedef unsigned long PluginWindowHandle; |
const PluginWindowHandle kNullPluginWindow = 0; |
+#elif defined(USE_AURA) && defined(OS_MACOSX) |
+ // Mac-Aura uses NSView-backed GLSurface. Regular Mac does not. |
+ // TODO(dhollowa): Rationalize these two definitions. http://crbug.com/104551. |
+ typedef NSView* PluginWindowHandle; |
+ const PluginWindowHandle kNullPluginWindow = 0; |
#else |
// On OS X we don't have windowed plugins. |
// We use a NULL/0 PluginWindowHandle in shared code to indicate there |
@@ -251,6 +256,11 @@ const AcceleratedWidget kNullAcceleratedWidget = NULL; |
#elif defined(USE_X11) |
typedef unsigned long AcceleratedWidget; |
const AcceleratedWidget kNullAcceleratedWidget = 0; |
+#elif defined(USE_AURA) && defined(OS_MACOSX) |
+// Mac-Aura uses NSView-backed GLSurface. Regular Mac does not. |
+// TODO(dhollowa): Rationalize these two definitions. http://crbug.com/104551. |
+typedef NSView* AcceleratedWidget; |
+const AcceleratedWidget kNullAcceleratedWidget = 0; |
#else |
typedef void* AcceleratedWidget; |
const AcceleratedWidget kNullAcceleratedWidget = NULL; |