Index: ui/views/test/desktop_test_views_delegate_aura.cc |
diff --git a/ui/views/test/desktop_test_views_delegate_aura.cc b/ui/views/test/desktop_test_views_delegate_aura.cc |
index 5627b071c15625e65f74d96f3203b4509446a99e..96f639111474c8f9294c2905b98eaf6b9d9bfd32 100644 |
--- a/ui/views/test/desktop_test_views_delegate_aura.cc |
+++ b/ui/views/test/desktop_test_views_delegate_aura.cc |
@@ -25,9 +25,11 @@ void DesktopTestViewsDelegate::OnBeforeWidgetInit( |
if (params->native_widget) |
return; |
- if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { |
+ if (params->parent && |
+ params->type != views::Widget::InitParams::TYPE_MENU && |
+ params->type != views::Widget::InitParams::TYPE_TOOLTIP) { |
params->native_widget = new views::NativeWidgetAura(delegate); |
- } else if (!params->parent && !params->context) { |
sadrul
2014/06/17 17:14:07
Why remove this?
pkotwicz
2014/06/17 18:11:29
Removing this better matches the behavior of OnBef
sadrul
2014/06/18 19:18:05
Is this necessary for the rest of the tooltip-rela
pkotwicz
2014/06/18 19:26:49
Yes, it is necessary in order to get the tooltip t
|
+ } else { |
params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
} |
#endif |