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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/test/desktop_test_views_delegate.h" 5 #include "ui/views/test/desktop_test_views_delegate.h"
6 6
7 #include "ui/views/widget/native_widget_aura.h" 7 #include "ui/views/widget/native_widget_aura.h"
8 8
9 #if !defined(OS_CHROMEOS) 9 #if !defined(OS_CHROMEOS)
10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
11 #endif 11 #endif
12 12
13 namespace views { 13 namespace views {
14 14
15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {} 15 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {}
16 16
17 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {} 17 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {}
18 18
19 void DesktopTestViewsDelegate::OnBeforeWidgetInit( 19 void DesktopTestViewsDelegate::OnBeforeWidgetInit(
20 Widget::InitParams* params, 20 Widget::InitParams* params,
21 internal::NativeWidgetDelegate* delegate) { 21 internal::NativeWidgetDelegate* delegate) {
22 #if !defined(OS_CHROMEOS) 22 #if !defined(OS_CHROMEOS)
23 // If we already have a native_widget, we don't have to try to come 23 // If we already have a native_widget, we don't have to try to come
24 // up with one. 24 // up with one.
25 if (params->native_widget) 25 if (params->native_widget)
26 return; 26 return;
27 27
28 if (params->parent && params->type != views::Widget::InitParams::TYPE_MENU) { 28 if (params->parent &&
29 params->type != views::Widget::InitParams::TYPE_MENU &&
30 params->type != views::Widget::InitParams::TYPE_TOOLTIP) {
29 params->native_widget = new views::NativeWidgetAura(delegate); 31 params->native_widget = new views::NativeWidgetAura(delegate);
30 } else if (!params->parent && !params->context) { 32 } else {
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
31 params->native_widget = new views::DesktopNativeWidgetAura(delegate); 33 params->native_widget = new views::DesktopNativeWidgetAura(delegate);
32 } 34 }
33 #endif 35 #endif
34 } 36 }
35 37
36 } // namespace views 38 } // namespace views
OLDNEW
« 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