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..4f493a0f927960bbe04768e3beb369cd2b29cd1c 100644 |
--- a/ui/gfx/native_widget_types.h |
+++ b/ui/gfx/native_widget_types.h |
@@ -227,6 +227,11 @@ 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) |
Ken Russell (switch to Gerrit)
2011/11/17 00:14:40
I think that this should be defined as defined(USE
dhollowa
2011/11/17 01:41:51
Done. Yes, I'd addressed this in Patch Set 4. It
|
+ // USE_WEBKIT_COMPOSITOR is defined in service of the USE_AURA port. These |
+ // definitions are currently not in use (or tested) beyond that. |
+ 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 +257,11 @@ const AcceleratedWidget kNullAcceleratedWidget = NULL; |
#elif defined(USE_X11) |
typedef unsigned long AcceleratedWidget; |
const AcceleratedWidget kNullAcceleratedWidget = 0; |
+#elif defined(USE_WEBKIT_COMPOSITOR) && defined(OS_MACOSX) |
+// USE_WEBKIT_COMPOSITOR is defined in service of the USE_AURA port. These |
+// definitions are currently not in use (or tested) beyond that. |
+typedef NSView* AcceleratedWidget; |
+const AcceleratedWidget kNullAcceleratedWidget = 0; |
#else |
typedef void* AcceleratedWidget; |
const AcceleratedWidget kNullAcceleratedWidget = NULL; |