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

Unified Diff: ui/views/test/desktop_test_views_delegate_aura.cc

Issue 333333003: Fixes TooltipControllerTest to create a toplevel window on Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« ui/views/corewm/DEPS ('K') | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« ui/views/corewm/DEPS ('K') | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698