Chromium Code Reviews| Index: ui/gfx/native_widget_types.h |
| diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h |
| index 3c4680de6dcad47a112940d8da80fb48e8180fa9..043125e795f90287eb82317521cd2a364a0c7008 100644 |
| --- a/ui/gfx/native_widget_types.h |
| +++ b/ui/gfx/native_widget_types.h |
| @@ -227,6 +227,9 @@ static inline NativeView NativeViewFromIdInBrowser(NativeViewId id) { |
| #elif defined(USE_X11) |
| typedef unsigned long PluginWindowHandle; |
| const PluginWindowHandle kNullPluginWindow = 0; |
| +#elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX) |
|
Nico
2011/11/16 19:11:13
I don't know what the longer-term plan for this is
dhollowa
2011/11/16 19:59:18
Done. Yes.
I also wonder about the possible merg
|
| + 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 |
| @@ -252,6 +255,9 @@ const AcceleratedWidget kNullAcceleratedWidget = NULL; |
| #elif defined(USE_X11) |
| typedef unsigned long AcceleratedWidget; |
| const AcceleratedWidget kNullAcceleratedWidget = 0; |
| +#elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX) |
| +typedef NSView* AcceleratedWidget; |
| +const AcceleratedWidget kNullAcceleratedWidget = 0; |
| #else |
| typedef void* AcceleratedWidget; |
| const AcceleratedWidget kNullAcceleratedWidget = NULL; |